From 35e40d7b98d2ed3be4fdf5b12fcf8449c304b282 Mon Sep 17 00:00:00 2001
From: brb <brb@esoft.com>
Date: Tue, 11 Jul 2023 11:24:33 +0200
Subject: [PATCH] added use of default values

---
 code/main.py | 41 ++++++++++++++++++++++++++++++++++-------
 1 file changed, 34 insertions(+), 7 deletions(-)

diff --git a/code/main.py b/code/main.py
index 81bf7e7..51f352f 100644
--- a/code/main.py
+++ b/code/main.py
@@ -1,15 +1,34 @@
 import time
 import logging
 import os
+from configparser import ConfigParser
+from pathlib import Path
 from initialise_app import initialise_app
 from bandwidth import measure as measure_bandwidth
 from database import connect
 
 
-def event():
-    logging.info('started event')
-    # get env vars
-    replicates = int(os.getenv('REPLICATES'))
+# load default values
+config = ConfigParser()
+config.read(Path(__file__).parent / 'defaults.ini')
+REPLICATES = int(config.get('main', 'replicates'))
+USER_ID = int(config.get('main', 'user_id'))
+TRIGGER_INTERVAL_SECONDS = float(
+    config.get(
+        'main',
+        'trigger_interval_seconds'
+    )
+)
+
+
+def event(
+    replicates: int = REPLICATES,
+    user_id: int = USER_ID
+):
+    logging.debug('started event')
+    # load environment variables
+    replicates = int(os.getenv('REPLICATES', default=REPLICATES))
+    user_id = int(os.getenv('USER_ID', default=USER_ID))
     # setup database connection
     db = connect()
     # run event
@@ -23,7 +42,7 @@ def event():
             continue
         # upload result to database
         payload_dict = {
-            'user_id': os.getenv('USER_ID'),
+            'user_id': user_id,
             'data': res
         }
         try:
@@ -33,7 +52,7 @@ def event():
             continue
         logging.debug(f'data sent to database received db_id: {db_id}')
         time.sleep(1)
-    logging.info('finished event')
+    logging.debug('finished')
 
 
 if __name__ == '__main__':
@@ -42,10 +61,18 @@ if __name__ == '__main__':
     while True:
         if time.time() >= trigger_time:
             # set new trigger time
-            trigger_time += int(os.getenv('TRIGGER_INTERVAL_SECONDS'))
+            trigger_interval = float(
+                os.getenv(
+                    'TRIGGER_INTERVAL_SECONDS',
+                    default=TRIGGER_INTERVAL_SECONDS
+                )
+            )
+            trigger_time += trigger_interval
             # run event
             try:
                 event()
             except Exception as e:
                 logging.error(e)
+            else:
+                logging.info('finished event')
         time.sleep(1)