#115 wasn't quite done. UTC/local work now

ptarmiganlabs · Oct 21, 2021 · 98710c4 · 98710c4
1 parent 4b2890c
commit 98710c4
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 12 deletions.
diff --git a/README.md b/README.md
@@ -148,7 +148,9 @@ scheduler:
     showPerAppSchedule: 
       enable: true        # Should the first itemCount scheduled runs be shown for each app, on startup?
       itemCount: 10       # Number of coming runs to show for each app
-  timeZone: LOCAL           # Valid values are UTC and LOCAL. Default value is UTC
+  timeZone:                 # Valid values are UTC and LOCAL. Default value is UTC
+    scheduleDefine: UTC     # How should times in the apps config file be interpreted? 
+    logs: UTC              # What time format should be used in log files?
 
 # Heartbeats can be used to send "I'm alive" messages to some other tool, e.g. an infrastructure monitoring tool
 # The concept is simple: The remoteURL will be called at the specified frequency. The receiving tool will then know

diff --git a/config/apps_config.yaml b/config/apps_config.yaml
@@ -26,13 +26,13 @@ apps:
     appDescription: Description of app 1
     appStepThroughSheets: false
     doInitialLoad: false
-    freq: every 1 hour
+    freq: every 5 mins every weekend
   - server: senseserver.mydomain.com
     appId: <app id 2>
     appDescription: Description of app 2
     appStepThroughSheets: false
     doInitialLoad: false
-    freq: every 2 hours
+    freq: at 5:00 pm
   - server: hsenseserverost2.mydomain.com
     appId: <app id 3>
     appDescription: Description of app 3

diff --git a/config/default_config.yaml b/config/default_config.yaml
@@ -8,9 +8,11 @@ fileLogging: false                # true/false to enable/disable logging to disk
 scheduler:
   startup: 
     showPerAppSchedule: 
-      enable: true        # Should the first itemCount scheduled runs be shown for each app, on startup?
-      itemCount: 10       # Number of coming runs to show for each app
-  timeZone: LOCAL         # Valid values are UTC and LOCAL. Default value is UTC
+      enable: true          # Should the first itemCount scheduled runs be shown for each app, on startup?
+      itemCount: 10         # Number of coming runs to show for each app
+  timeZone:                 # Valid values are UTC and LOCAL. Default value is UTC
+    scheduleDefine: UTC     # How should times in the apps config file be interpreted? 
+    logs: UTC              # What time format should be used in log files?
 
 # Heartbeats can be used to send "I'm alive" messages to some other tool, e.g. an infrastructure monitoring tool
 # The concept is simple: The remoteURL will be called at the specified frequency. The receiving tool will then know 

diff --git a/index.js b/index.js
@@ -170,7 +170,8 @@ function loadAppConfig(appConfig) {
                 const showItemCount = globals.config.get(
                     'scheduler.startup.showPerAppSchedule.itemCount'
                 );
-                const occurrences = later.schedule(sched).next(showItemCount);
+                const s = later.schedule(sched);
+                const occurrences = s.next(showItemCount);
 
                 globals.logger.info(
                     '-------------------------------------------------------------------------'
@@ -179,12 +180,13 @@ function loadAppConfig(appConfig) {
                 // eslint-disable-next-line no-plusplus
                 for (let i = 0; i < showItemCount; i++) {
                     if (
-                        globals.config.has('scheduler.timeZone') &&
-                        globals.config.get('scheduler.timeZone').toLowerCase() === 'local'
+                        globals.config.has('scheduler.timeZone.logs') &&
+                        globals.config.get('scheduler.timeZone.logs').toLowerCase() === 'local'
                     ) {
                         globals.logger.info(`${i + 1}: ${occurrences[i]}`);
                     } else {
-                        globals.logger.info(`${i + 1}: ${occurrences[i].toUTCString()}`);
+                        const utcString = occurrences[i].toUTCString();
+                        globals.logger.info(`${i + 1}: ${utcString}`);
                     }
                 }
             }
@@ -272,8 +274,8 @@ async function mainScript() {
     }
 
     // Set up UTC/local time zone
-    if (globals.config.has('scheduler.timeZone')) {
-        const tz = globals.config.get('scheduler.timeZone');
+    if (globals.config.has('scheduler.timeZone.scheduleDefine')) {
+        const tz = globals.config.get('scheduler.timeZone.scheduleDefine');
         if (tz.toLowerCase() === 'local') {
             later.date.localTime();
         } else {