Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
jio
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Labels
Merge Requests
18
Merge Requests
18
Analytics
Analytics
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Commits
Open sidebar
nexedi
jio
Commits
a68af21a
Commit
a68af21a
authored
Apr 07, 2014
by
Tristan Cavelier
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
jio.js updated
parent
c9a368e5
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
31 additions
and
13 deletions
+31
-13
jio.js
jio.js
+31
-13
No files found.
jio.js
View file @
a68af21a
...
@@ -2280,7 +2280,7 @@ function addJobRuleCondition(name, method) {
...
@@ -2280,7 +2280,7 @@ function addJobRuleCondition(name, method) {
exports
.
addJobRuleCondition
=
addJobRuleCondition
;
exports
.
addJobRuleCondition
=
addJobRuleCondition
;
/*jslint indent: 2, maxlen: 80, sloppy: true, nomen: true, regexp: true */
/*jslint indent: 2, maxlen: 80, sloppy: true, nomen: true, regexp: true */
/*global constants, dictUpdate, deepClone */
/*global constants, dictUpdate, deepClone
, DOMException
*/
function
restCommandRejecter
(
param
,
args
)
{
function
restCommandRejecter
(
param
,
args
)
{
// reject(status, reason, message, {"custom": "value"});
// reject(status, reason, message, {"custom": "value"});
...
@@ -2353,8 +2353,22 @@ function restCommandRejecter(param, args) {
...
@@ -2353,8 +2353,22 @@ function restCommandRejecter(param, args) {
if
((
arg
.
statusText
||
arg
.
status
>=
0
))
{
if
((
arg
.
statusText
||
arg
.
status
>=
0
))
{
current_priority
.
status
=
arg
.
statusText
||
arg
.
status
;
current_priority
.
status
=
arg
.
statusText
||
arg
.
status
;
}
}
if
(
arg
instanceof
Error
)
{
if
(
arg
instanceof
Error
||
arg
instanceof
DOMException
)
{
current_priority
.
reason
=
arg
.
message
||
""
;
if
(
arg
.
code
!==
undefined
&&
arg
.
code
!==
null
)
{
current_priority
.
code
=
arg
.
code
;
}
if
(
arg
.
lineNumber
!==
undefined
&&
arg
.
lineNumber
!==
null
)
{
current_priority
.
lineNumber
=
arg
.
lineNumber
;
}
if
(
arg
.
columnNumber
!==
undefined
&&
arg
.
columnNumber
!==
null
)
{
current_priority
.
columnNumber
=
arg
.
columnNumber
;
}
if
(
arg
.
filename
!==
undefined
&&
arg
.
filename
!==
null
)
{
current_priority
.
filename
=
arg
.
filename
;
}
if
(
arg
.
message
!==
undefined
&&
arg
.
message
!==
null
)
{
current_priority
.
reason
=
arg
.
message
;
}
current_priority
.
error
=
arg
.
name
;
current_priority
.
error
=
arg
.
name
;
}
}
}
}
...
@@ -2385,6 +2399,7 @@ function restCommandRejecter(param, args) {
...
@@ -2385,6 +2399,7 @@ function restCommandRejecter(param, args) {
priority
.
error
=
priority
.
statusText
.
toLowerCase
().
replace
(
/ /g
,
'
_
'
).
priority
.
error
=
priority
.
statusText
.
toLowerCase
().
replace
(
/ /g
,
'
_
'
).
replace
(
/
[^
_a-z
]
/g
,
''
);
replace
(
/
[^
_a-z
]
/g
,
''
);
}
}
param
.
storage_response
=
priority
;
return
param
.
solver
.
reject
(
deepClone
(
priority
));
return
param
.
solver
.
reject
(
deepClone
(
priority
));
}
}
...
@@ -2512,6 +2527,7 @@ function restCommandResolver(param, args) {
...
@@ -2512,6 +2527,7 @@ function restCommandResolver(param, args) {
]);
]);
}
}
param
.
storage_response
=
priority
;
return
param
.
solver
.
resolve
(
deepClone
(
priority
));
return
param
.
solver
.
resolve
(
deepClone
(
priority
));
}
}
...
@@ -2558,11 +2574,11 @@ function enableJobChecker(jio, shared, options) {
...
@@ -2558,11 +2574,11 @@ function enableJobChecker(jio, shared, options) {
if
(
!
original_job
.
solver
)
{
if
(
!
original_job
.
solver
)
{
original_job
.
solver
=
new_job
.
solver
;
original_job
.
solver
=
new_job
.
solver
;
}
else
{
}
else
{
original_job
.
promise
.
then
(
original_job
.
promise
.
then
(
function
()
{
new_job
.
command
.
resolve
,
new_job
.
command
.
resolve
(
deepClone
(
original_job
.
storage_response
));
new_job
.
command
.
reject
,
},
function
()
{
new_job
.
command
.
notify
new_job
.
command
.
reject
(
deepClone
(
original_job
.
storage_response
));
);
},
new_job
.
command
.
notify
);
}
}
}
}
new_job
.
state
=
'
running
'
;
new_job
.
state
=
'
running
'
;
...
@@ -3111,9 +3127,10 @@ function enableJobRecovery(jio, shared, options) {
...
@@ -3111,9 +3127,10 @@ function enableJobRecovery(jio, shared, options) {
var
i
,
job_array
,
delay
,
deadline
,
recovery_delay
;
var
i
,
job_array
,
delay
,
deadline
,
recovery_delay
;
recovery_delay
=
numberOrDefault
(
options
.
recovery_delay
,
10000
);
// 1 m 30 s === default firefox request timeout
recovery_delay
=
numberOrDefault
(
options
.
recovery_delay
,
90000
);
if
(
recovery_delay
<
0
)
{
if
(
recovery_delay
<
0
)
{
recovery_delay
=
1
0000
;
recovery_delay
=
9
0000
;
}
}
if
(
options
.
job_management
!==
false
&&
options
.
job_recovery
!==
false
)
{
if
(
options
.
job_management
!==
false
&&
options
.
job_recovery
!==
false
)
{
...
@@ -3314,8 +3331,8 @@ function enableJobTimeout(jio, shared, options) {
...
@@ -3314,8 +3331,8 @@ function enableJobTimeout(jio, shared, options) {
number
:
default_value
);
number
:
default_value
);
}
}
//
10 seconds
by default
//
Infinity
by default
var
default_timeout
=
positiveNumberOrDefault
(
options
.
default_timeout
,
1000
0
);
var
default_timeout
=
positiveNumberOrDefault
(
options
.
default_timeout
,
0
);
function
timeoutReject
(
param
)
{
function
timeoutReject
(
param
)
{
return
function
()
{
return
function
()
{
...
@@ -3330,7 +3347,8 @@ function enableJobTimeout(jio, shared, options) {
...
@@ -3330,7 +3347,8 @@ function enableJobTimeout(jio, shared, options) {
}
}
function
initJob
(
job
)
{
function
initJob
(
job
)
{
if
(
typeof
job
.
timeout
!==
'
number
'
||
job
.
timeout
<
0
)
{
if
(
typeof
job
.
timeout
!==
'
number
'
||
!
isFinite
(
job
.
timeout
)
||
job
.
timeout
<
0
)
{
job
.
timeout
=
positiveNumberOrDefault
(
job
.
timeout
=
positiveNumberOrDefault
(
job
.
options
.
timeout
,
job
.
options
.
timeout
,
default_timeout
default_timeout
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment