Commit d7746222 authored by Tristan Cavelier's avatar Tristan Cavelier

One job rule condition added + 2 default job rules modified

parent d4b86325
...@@ -421,6 +421,23 @@ defaults.job_rule_conditions = {}; ...@@ -421,6 +421,23 @@ defaults.job_rule_conditions = {};
return a.kwargs._id === b.kwargs._id; return a.kwargs._id === b.kwargs._id;
} }
/**
* Test if the jobs have a document id.
*
* @param {Object} a The first job to test
* @param {Object} b The second job to test
* @return {Boolean} True if ids exist, else false
*/
function haveDocumentIds(a, b) {
if (typeof a.kwargs._id !== "string" || a.kwargs._id === "") {
return false;
}
if (typeof b.kwargs._id !== "string" || b.kwargs._id === "") {
return false;
}
return true;
}
/** /**
* Compare two jobs and test if their kwargs are equal * Compare two jobs and test if their kwargs are equal
* *
...@@ -452,7 +469,8 @@ defaults.job_rule_conditions = {}; ...@@ -452,7 +469,8 @@ defaults.job_rule_conditions = {};
"sameMethod": sameMethod, "sameMethod": sameMethod,
"sameDocumentId": sameDocumentId, "sameDocumentId": sameDocumentId,
"sameParameters": sameParameters, "sameParameters": sameParameters,
"sameOptions": sameOptions "sameOptions": sameOptions,
"haveDocumentIds": haveDocumentIds
}; };
}()); }());
...@@ -210,6 +210,7 @@ function enableJobChecker(jio, shared, options) { ...@@ -210,6 +210,7 @@ function enableJobChecker(jio, shared, options) {
"sameStorageDescription", "sameStorageDescription",
"areWriters", "areWriters",
"sameMethod", "sameMethod",
"haveDocumentIds",
"sameParameters" "sameParameters"
], ],
"action": "update" "action": "update"
...@@ -218,6 +219,7 @@ function enableJobChecker(jio, shared, options) { ...@@ -218,6 +219,7 @@ function enableJobChecker(jio, shared, options) {
"conditions": [ "conditions": [
"sameStorageDescription", "sameStorageDescription",
"areWriters", "areWriters",
"haveDocumentIds",
"sameDocumentId" "sameDocumentId"
], ],
"action": "wait" "action": "wait"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment