Add template props file. Add port variable.

.gitignore

@@ -1,3 +1,6 @@
+# Config files
+.env
+
 # Sensor files
 MQ7.h
 MQ7.cpp

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,15 +25,15 @@ 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()
 
             cursor.callproc('sp_create_device', (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,15 +53,15 @@ 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()
 
             cursor.callproc('sp_update_device', (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()
 

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")

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,15 +20,15 @@ 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()
 
             cursor.callproc('sp_create_event', (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")

server/routes/firefighters.py

@@ -9,27 +9,27 @@ 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):
 
 
         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()
 
             cursor.callproc('sp_create_firefighter', (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,19 +46,19 @@ 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()
 
             cursor.callproc('sp_update_firefighter', (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()
 

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()
 

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")

server/routes/metrics.py

@@ -8,20 +8,19 @@ 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):
         print("get_allmetrics - entro en la funcion")
 
         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")

server/routes/metrics_new.py

@@ -8,19 +8,19 @@ 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):
         print("get_allmetrics - entro en la funcion")
 
         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()
 

server/routes/status.py

@@ -10,19 +10,19 @@ 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):
         print("get_allstatus - entro en la funcion")
 
         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()
 

server/template.env

@@ -0,0 +1,5 @@
+# MariaDB
+MARIADB_HOST=
+MARIADB_PORT=
+MARIADB_USERNAME=
+MARIADB_PASSWORD=