From 801868ec96f2209746c5b632bf5205bafed74243 Mon Sep 17 00:00:00 2001 From: Daniel Krook Date: Thu, 27 Aug 2020 15:18:36 -0400 Subject: [PATCH] Add template props file. Add port variable. --- .gitignore | 3 +++ server/routes/devices.py | 14 +++++------ server/routes/event_types.py | 4 +-- server/routes/events.py | 24 +++++++++--------- server/routes/firefighters.py | 46 +++++++++++++++++------------------ server/routes/fuel_types.py | 5 ++-- server/routes/index.py | 2 +- server/routes/metrics.py | 13 +++++----- server/routes/metrics_new.py | 12 ++++----- server/routes/status.py | 12 ++++----- server/template.env | 5 ++++ 11 files changed, 74 insertions(+), 66 deletions(-) create mode 100644 server/template.env diff --git a/.gitignore b/.gitignore index bf5846d..f7eeee1 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,6 @@ +# Config files +.env + # Sensor files MQ7.h MQ7.cpp diff --git a/server/routes/devices.py b/server/routes/devices.py index 3062584..ffbb76c 100644 --- a/server/routes/devices.py +++ b/server/routes/devices.py @@ -13,7 +13,7 @@ class devices(object): def __init__(self): load_dotenv() - self.logger = logging.getLogger('prometo.device.devices') + self.logger = logging.getLogger('prometeo.device.devices') self.logger.debug('creating an instance of devices') def insert_device(self, sensorid, model, version): @@ -25,7 +25,7 @@ def insert_device(self, sensorid, model, version): password = os.getenv("MARIADB_PASSWORD"), host = os.getenv("MARIADB_HOST"), database = "prometeo", - port = 3306) + port = int(os.getenv("MARIADB_PORT"))) cursor = conn.cursor() @@ -33,7 +33,7 @@ def insert_device(self, sensorid, model, version): data = cursor.fetchall() - if len(data[0][0]) is 0: + if len(data[0][0]) == 0: con.commit() return True else: @@ -53,7 +53,7 @@ def update_device(self, sensorid, model, version): password = os.getenv("MARIADB_PASSWORD"), host = os.getenv("MARIADB_HOST"), database = "prometeo", - port = 3306) + port = int(os.getenv("MARIADB_PORT"))) cursor = conn.cursor() @@ -61,7 +61,7 @@ def update_device(self, sensorid, model, version): data = cursor.fetchall() - if len(data[0][0]) is 0: + if len(data[0][0]) == 0: con.commit() return True else: @@ -84,7 +84,7 @@ def get_device(self, sensorid): password = os.getenv("MARIADB_PASSWORD"), host = os.getenv("MARIADB_HOST"), database = "prometeo", - port = 3306) + port = int(os.getenv("MARIADB_PORT"))) cursor = conn.cursor() @@ -116,7 +116,7 @@ def get_alldevices(self): password = os.getenv("MARIADB_PASSWORD"), host = os.getenv("MARIADB_HOST"), database = "prometeo", - port = 3306) + port = int(os.getenv("MARIADB_PORT"))) cursor = conn.cursor() diff --git a/server/routes/event_types.py b/server/routes/event_types.py index b38ce44..615bbf1 100644 --- a/server/routes/event_types.py +++ b/server/routes/event_types.py @@ -9,7 +9,7 @@ class eventTypes(object): def __init__(self): load_dotenv() - self.logger = logging.getLogger('prometo.eventTypes.event_Types') + self.logger = logging.getLogger('prometeo.eventTypes.event_Types') self.logger.debug('creating an instance of eventTypes') def get_alleventtypes(self): @@ -21,7 +21,7 @@ def get_alleventtypes(self): password = os.getenv("MARIADB_PASSWORD"), host = os.getenv("MARIADB_HOST"), database = "prometeo", - port = 3306) + port = int(os.getenv("MARIADB_PORT"))) cursor = conn.cursor() print("get_alleventTypes - llamada a sql") diff --git a/server/routes/events.py b/server/routes/events.py index a28c625..f32cce5 100644 --- a/server/routes/events.py +++ b/server/routes/events.py @@ -9,7 +9,7 @@ class event(object): def __init__(self): load_dotenv() - self.logger = logging.getLogger('prometo.event.events') + self.logger = logging.getLogger('prometeo.event.events') self.logger.debug('creating an instance of event') def insert_event(self, data): @@ -20,7 +20,7 @@ def insert_event(self, data): password = os.getenv("MARIADB_PASSWORD"), host = os.getenv("MARIADB_HOST"), database = "prometeo", - port = 3306) + port = int(os.getenv("MARIADB_PORT"))) cursor = conn.cursor() @@ -28,7 +28,7 @@ def insert_event(self, data): data = cursor.fetchall() - if len(data[0][0]) is 0: + if len(data[0][0]) == 0: con.commit() return True else: @@ -49,14 +49,14 @@ def update_event(self, data): password = os.getenv("MARIADB_PASSWORD"), host = os.getenv("MARIADB_HOST"), database = "prometeo", - port = 3306) + port = int(os.getenv("MARIADB_PORT"))) cursor = conn.cursor() cursor.callproc('sp_update_event', (data)) data = cursor.fetchall() - if len(data[0][0]) is 0: + if len(data[0][0]) == 0: con.commit() return True else: @@ -76,7 +76,7 @@ def get_event(self, eventid): password = os.getenv("MARIADB_PASSWORD"), host = os.getenv("MARIADB_HOST"), database = "prometeo", - port = 3306) + port = int(os.getenv("MARIADB_PORT"))) cursor = conn.cursor() print("get_event") @@ -111,7 +111,7 @@ def get_allevents(self): password = os.getenv("MARIADB_PASSWORD"), host = os.getenv("MARIADB_HOST"), database = "prometeo", - port = 3306) + port = int(os.getenv("MARIADB_PORT"))) cursor = conn.cursor() @@ -137,11 +137,11 @@ def get_allevents(self): def get_event_firefighters_devices(self, eventid): try: conn = mariadb.connect( - user=os.getenv("MARIADB_USERNAME"), - password=os.getenv("MARIADB_PASSWORD"), - host=os.getenv("MARIADB_HOST"), - database="prometeo", - port=3306) + user = os.getenv("MARIADB_USERNAME"), + password = os.getenv("MARIADB_PASSWORD"), + host = os.getenv("MARIADB_HOST"), + database = "prometeo", + port = int(os.getenv("MARIADB_PORT"))) cursor = conn.cursor() print("get_event") diff --git a/server/routes/firefighters.py b/server/routes/firefighters.py index 2dfc7fa..d7bfbe8 100644 --- a/server/routes/firefighters.py +++ b/server/routes/firefighters.py @@ -9,7 +9,7 @@ class firefighters(object): def __init__(self): load_dotenv() - self.logger = logging.getLogger('prometo.firefighters.fire_fighters') + self.logger = logging.getLogger('prometeo.firefighters.fire_fighters') self.logger.debug('creating an instance of firefighters') def insert_firefighter(self, bomberoid, nombre, apellidos, email): @@ -17,11 +17,11 @@ def insert_firefighter(self, bomberoid, nombre, apellidos, email): try: conn = mariadb.connect( - user=os.getenv("MARIADB_USERNAME"), - password=os.getenv("MARIADB_PASSWORD"), - host=os.getenv("MARIADB_HOST"), - database="prometeo", - port=3306) + user = os.getenv("MARIADB_USERNAME"), + password = os.getenv("MARIADB_PASSWORD"), + host = os.getenv("MARIADB_HOST"), + database = "prometeo", + port = int(os.getenv("MARIADB_PORT"))) cursor = conn.cursor() @@ -29,7 +29,7 @@ def insert_firefighter(self, bomberoid, nombre, apellidos, email): data = cursor.fetchall() - if len(data[0][0]) is 0: + if len(data[0][0]) == 0: con.commit() return True else: @@ -46,11 +46,11 @@ def insert_firefighter(self, bomberoid, nombre, apellidos, email): def update_firefighter(self, bomberoid, nombre, apellidos, email): try: conn = mariadb.connect( - user=os.getenv("MARIADB_USERNAME"), - password=os.getenv("MARIADB_PASSWORD"), - host=os.getenv("MARIADB_HOST"), - database="prometeo", - port=3306) + user = os.getenv("MARIADB_USERNAME"), + password = os.getenv("MARIADB_PASSWORD"), + host = os.getenv("MARIADB_HOST"), + database = "prometeo", + port = int(os.getenv("MARIADB_PORT"))) cursor = conn.cursor() @@ -58,7 +58,7 @@ def update_firefighter(self, bomberoid, nombre, apellidos, email): data = cursor.fetchall() - if len(data[0][0]) is 0: + if len(data[0][0]) == 0: con.commit() return True else: @@ -74,11 +74,11 @@ def update_firefighter(self, bomberoid, nombre, apellidos, email): def get_firefighter(self, bomberoid): try: conn = mariadb.connect( - user=os.getenv("MARIADB_USERNAME"), - password=os.getenv("MARIADB_PASSWORD"), - host=os.getenv("MARIADB_HOST"), - database="prometeo", - port=3306) + user = os.getenv("MARIADB_USERNAME"), + password = os.getenv("MARIADB_PASSWORD"), + host = os.getenv("MARIADB_HOST"), + database = "prometeo", + port = int(os.getenv("MARIADB_PORT"))) cursor = conn.cursor() @@ -103,11 +103,11 @@ def get_allfirefighters(self): try: conn = mariadb.connect( - user=os.getenv("MARIADB_USERNAME"), - password=os.getenv("MARIADB_PASSWORD"), - host=os.getenv("MARIADB_HOST"), - database="prometeo", - port=3306) + user = os.getenv("MARIADB_USERNAME"), + password = os.getenv("MARIADB_PASSWORD"), + host = os.getenv("MARIADB_HOST"), + database = "prometeo", + port = int(os.getenv("MARIADB_PORT"))) cursor = conn.cursor() diff --git a/server/routes/fuel_types.py b/server/routes/fuel_types.py index 20988c5..816559a 100644 --- a/server/routes/fuel_types.py +++ b/server/routes/fuel_types.py @@ -9,7 +9,7 @@ class fuelTypes(object): def __init__(self): load_dotenv() logging.basicConfig(level=os.environ.get("LOGLEVEL", "INFO")) - self.logger = logging.getLogger('prometo.fuel_types.fuelTypes') + self.logger = logging.getLogger('prometeo.fuel_types.fuelTypes') self.logger.info('creating an instance of fuelTypes') def get_allfueltypes(self): @@ -18,7 +18,8 @@ def get_allfueltypes(self): user = os.getenv("MARIADB_USERNAME"), password = os.getenv("MARIADB_PASSWORD"), host = os.getenv("MARIADB_HOST"), - database = "prometeo") + database = "prometeo", + port = int(os.getenv("MARIADB_PORT"))) cursor = conn.cursor() diff --git a/server/routes/index.py b/server/routes/index.py index bd06d0b..46b34f6 100755 --- a/server/routes/index.py +++ b/server/routes/index.py @@ -159,7 +159,7 @@ def testdb(): user=os.getenv("MARIADB_USERNAME"), password=os.getenv("MARIADB_PASSWORD"), host=os.getenv("MARIADB_HOST"), - port=3306) + port = int(os.getenv("MARIADB_PORT"))) cursor = conn.cursor() cursor.execute("SHOW DATABASES") diff --git a/server/routes/metrics.py b/server/routes/metrics.py index 8927ebc..0cec4ac 100644 --- a/server/routes/metrics.py +++ b/server/routes/metrics.py @@ -8,7 +8,7 @@ class metrics(object): def __init__(self): load_dotenv() - self.logger = logging.getLogger('prometo.metric.metrics') + self.logger = logging.getLogger('prometeo.metric.metrics') self.logger.debug('creating an instance of metrics') def get_allmetrics(self, sensorid, event_date, max_mediciones): @@ -16,12 +16,11 @@ def get_allmetrics(self, sensorid, event_date, max_mediciones): try: conn = mariadb.connect( - user=os.getenv("MARIADB_USERNAME"), - password=os.getenv("MARIADB_PASSWORD"), - host=os.getenv("MARIADB_HOST"), - database="prometeo", - port=3306) - + user = os.getenv("MARIADB_USERNAME"), + password = os.getenv("MARIADB_PASSWORD"), + host = os.getenv("MARIADB_HOST"), + database = "prometeo", + port = int(os.getenv("MARIADB_PORT"))) cursor = conn.cursor() print("get_allmetrics - llamada a sql") diff --git a/server/routes/metrics_new.py b/server/routes/metrics_new.py index 5c9a3d2..b657e3b 100644 --- a/server/routes/metrics_new.py +++ b/server/routes/metrics_new.py @@ -8,7 +8,7 @@ class metrics(object): def __init__(self): load_dotenv() - self.logger = logging.getLogger('prometo.newmetric.new_metrics') + self.logger = logging.getLogger('prometeo.newmetric.new_metrics') self.logger.debug('creating an instance of metrics') def get_allmetrics(self, sensorid, event_date, max_mediciones): @@ -16,11 +16,11 @@ def get_allmetrics(self, sensorid, event_date, max_mediciones): try: conn = mariadb.connect( - user=os.getenv("MARIADB_USERNAME"), - password=os.getenv("MARIADB_PASSWORD"), - host=os.getenv("MARIADB_HOST"), - database="prometeo", - port=3306) + user = os.getenv("MARIADB_USERNAME"), + password = os.getenv("MARIADB_PASSWORD"), + host = os.getenv("MARIADB_HOST"), + database = "prometeo", + port = int(os.getenv("MARIADB_PORT"))) cursor = conn.cursor() diff --git a/server/routes/status.py b/server/routes/status.py index 3485910..8df7b42 100644 --- a/server/routes/status.py +++ b/server/routes/status.py @@ -10,7 +10,7 @@ class status(object): def __init__(self): load_dotenv() - self.logger = logging.getLogger('prometo.status.status_webapp') + self.logger = logging.getLogger('prometeo.status.status_webapp') self.logger.debug('creating an instance of status') def get_allstatus(self): @@ -18,11 +18,11 @@ def get_allstatus(self): try: conn = mariadb.connect( - user=os.getenv("MARIADB_USERNAME"), - password=os.getenv("MARIADB_PASSWORD"), - host=os.getenv("MARIADB_HOST"), - database="prometeo", - port=3306) + user = os.getenv("MARIADB_USERNAME"), + password = os.getenv("MARIADB_PASSWORD"), + host = os.getenv("MARIADB_HOST"), + database = "prometeo", + port = int(os.getenv("MARIADB_PORT"))) cursor = conn.cursor() diff --git a/server/template.env b/server/template.env new file mode 100644 index 0000000..592e6e9 --- /dev/null +++ b/server/template.env @@ -0,0 +1,5 @@ +# MariaDB +MARIADB_HOST= +MARIADB_PORT= +MARIADB_USERNAME= +MARIADB_PASSWORD= \ No newline at end of file