From 9d9509525c8a1f4e205774dec8801b8d04bda28e Mon Sep 17 00:00:00 2001 From: Girish Ramakrishnan Date: Tue, 3 Nov 2015 16:11:24 -0800 Subject: [PATCH] listen on timezone key only when configured --- src/cloudron.js | 2 ++ src/cron.js | 5 +++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/cloudron.js b/src/cloudron.js index ca1bad359..24c09b330 100644 --- a/src/cloudron.js +++ b/src/cloudron.js @@ -157,6 +157,8 @@ function syncConfigState(callback) { isConfigured(function (error, configured) { if (error) return callback(error); + debug('syncConfigState: configured = %s', configured); + if (configured) { exports.events.emit(exports.EVENT_CONFIGURED); } else { diff --git a/src/cron.js b/src/cron.js index a2517c8f5..e1228b9c6 100644 --- a/src/cron.js +++ b/src/cron.js @@ -38,8 +38,6 @@ var NOOP_CALLBACK = function (error) { if (error) console.error(error); }; function initialize(callback) { assert.strictEqual(typeof callback, 'function'); - settings.events.on(settings.TIME_ZONE_KEY, recreateJobs); - gHeartbeatJob = new CronJob({ cronTime: '00 */1 * * * *', // every minute onTick: cloudron.sendHeartbeat, @@ -113,6 +111,9 @@ function recreateJobs(unusedTimeZone, callback) { settings.events.on(settings.AUTOUPDATE_PATTERN_KEY, autoupdatePatternChanged); autoupdatePatternChanged(allSettings[settings.AUTOUPDATE_PATTERN_KEY]); + settings.events.removeListener(settings.TIME_ZONE_KEY, recreateJobs); + settings.events.on(settings.TIME_ZONE_KEY, recreateJobs); + if (callback) callback(); }); }