sync to 0.9.38

lib/job.js

@@ -790,7 +790,7 @@ module.exports = Class.create({
 		}
 
 		// only pull in properties we recognize
-		['progress', 'memo', 'complete', 'code', 'description', 'perf', 'update_event', 'table', 'html', 'chain', 'chain_data', 'chain_error', 'notify_success', 'notify_fail'].forEach(function (key) {
+		['progress', 'memo', 'complete', 'code', 'description', 'perf', 'update_event', 'table', 'html', 'chain', 'chain_data', 'chain_params', 'chain_error', 'notify_success', 'notify_fail'].forEach(function (key) {
 			if (key in data) job[key] = data[key];
 		});
 

lib/scheduler.js

@@ -70,6 +70,11 @@ module.exports = Class.create({
 		}); // loaded state
 	},
 
+	safeJobLog(job) { // print less verbose, more readable job data on logging
+		if(!job) return ''
+		return Object.keys(job).filter(e => ! ["table", "secret", "env"].includes(e)).map(e => e + ': ' + ("params|workflow|perf".indexOf(e) > -1 ? JSON.stringify(job[e]) : job[e]) ).join(" | ")
+	},
+
 	schedulerMinuteTick: function (dargs, catch_up_only) {
 		// a new minute has started, see if jobs need to run
 		var self = this;
@@ -338,7 +343,12 @@ module.exports = Class.create({
 				source_event: old_job.event
 			});
 
-			self.logDebug(6, "Running event via chain reaction: " + job.title, job);
+
+			// merge in chain_params if applicable
+			if (!job.params) job.params = {};
+			if (old_job.chain_params) Tools.mergeHashInto(job.params, old_job.chain_params);
+
+			self.logDebug(6, "Running event via chain reaction: " + job.title, self.safeJobLog(job));
 
 			self.launchOrQueueJob(job, function (err, jobs_launched) {
 				if (err) {

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "cronicle-edge",
-	"version": "1.7.4",
+	"version": "1.7.5",
 	"description": "A simple, distributed task scheduler and runner with a web based UI.",
 	"author": "Joseph Huckaby <[email protected]>",
 	"homepage": "https://github.com/jhuckaby/Cronicle",