diff --git a/agent/src/config.py b/agent/src/config.py index c5ae3f3..0784f0c 100644 --- a/agent/src/config.py +++ b/agent/src/config.py @@ -1,18 +1,17 @@ import os - def try_parse(type, value: str): try: return type(value) except Exception: return None - -USER_ID = try_parse(int, os.environ.get("USER_ID")) or 1 # MQTT config MQTT_BROKER_HOST = os.environ.get("MQTT_BROKER_HOST") or "mqtt" MQTT_BROKER_PORT = try_parse(int, os.environ.get("MQTT_BROKER_PORT")) or 1883 MQTT_TOPIC = os.environ.get("MQTT_TOPIC") or "agent" -# Delay for sending data to mqtt in seconds +# Data-related config +USER_ID = try_parse(int, os.environ.get("USER_ID")) or 1 DELAY = try_parse(float, os.environ.get("DELAY")) or 1 +GPS_SOURCE = os.environ.get("GPS_SOURCE") or "data/gps.csv" diff --git a/agent/src/main.py b/agent/src/main.py index 1b43cc5..11faeda 100644 --- a/agent/src/main.py +++ b/agent/src/main.py @@ -42,7 +42,7 @@ def run(): # Prepare mqtt client client = connect_mqtt(config.MQTT_BROKER_HOST, config.MQTT_BROKER_PORT) # Prepare datasource - datasource = FileDatasource(16384.0, "data/accelerometer.csv", "data/gps.csv", "data/parking.csv") + datasource = FileDatasource(16384.0, "data/accelerometer.csv", config.GPS_SOURCE, "data/parking.csv") # Infinity publish data publish(client, config.MQTT_TOPIC, datasource)