diff --git a/coffee/components-manager.coffee b/coffee/components-manager.coffee index d9e8d49..a6c631e 100644 --- a/coffee/components-manager.coffee +++ b/coffee/components-manager.coffee @@ -62,9 +62,8 @@ exports.addRuleListener = ( eh ) => try oRule = JSON.parse strRule db.resetLog userName, oRule.id - - eventInfo = '' - if oRule.event_start + eventInfo = '' + if oRule.event_start eventInfo = "Starting at #{ new Date( oRule.event_start ) }, Interval set to #{ oRule.event_interval } minutes" db.appendLog userName, oRule.id, "INIT", "Rule '#{ oRule.id }' initialized. #{ eventInfo }" diff --git a/js/components-manager.js b/js/components-manager.js index 33aab8a..ca71f01 100644 --- a/js/components-manager.js +++ b/js/components-manager.js @@ -62,11 +62,15 @@ Components Manager fFetchRule = function(userName) { return function(rule) { return db.getRule(rule, function(err, strRule) { - var oRule; + var eventInfo, oRule; try { oRule = JSON.parse(strRule); db.resetLog(userName, oRule.id); - db.appendLog(userName, oRule.id, "INIT", "Rule '" + oRule.id + "' initialized. Interval set to " + oRule.event_interval + " minutes"); + eventInfo = ''; + if (oRule.event_start) { + eventInfo = "Starting at " + (new Date(oRule.event_start)) + ", Interval set to " + oRule.event_interval + " minutes"; + } + db.appendLog(userName, oRule.id, "INIT", "Rule '" + oRule.id + "' initialized. " + eventInfo); return eventEmitter.emit('rule', { event: 'init', user: userName,