fix service - send data to firebase every hour

potier97 · Aug 31, 2020 · 0a29650 · 0a29650
1 parent a511b5b
commit 0a29650
Show file tree

Hide file tree

Showing 11 changed files with 182 additions and 61 deletions.
diff --git a/requirements.txt b/requirements.txt
@@ -0,0 +1,4 @@
+firebase-admin
+grpcio==1.13.0rc3
+google-cloud-firestore==0.29.0
+google-cloud-storage==1.10.0
diff --git a/service/__pycache__/files.cpython-37.pyc b/service/__pycache__/files.cpython-37.pyc
diff --git a/service/__pycache__/firebase.cpython-37.pyc b/service/__pycache__/firebase.cpython-37.pyc
diff --git a/service/copyMain.py b/service/copyMain.py
@@ -0,0 +1,52 @@
+#!/usr/bin/python3
+import os
+import schedule
+from blink import blink
+import time
+import files
+import firebase
+import calculation
+
+firebase.validateAccount()
+#ledPin = 11
+newBlink = blink()
+
+
+def simpleJob():
+
+    try:
+        for i in range(10):
+            newBlink.ledOn(0.5)
+            newBlink.ledOff(0.5)
+
+        #Get dateTime Now
+        currentDatetime = files.currentTime()
+        #Diccionario - firebase
+        nodes = firebase.dicNodes(currentDatetime, calculation.genereRandomList(), calculation.genereRandomList(), calculation.genereRandomList(), calculation.genereRandomList(), calculation.genereRandomList())
+        #firebase.validateAccount()
+        firebase.insertData(nodes)
+        #Add to logs.txt
+        newMessage = 'New data added on:'
+        nowConvert = files.dateTimeConvert(currentDatetime)
+        files.manageFiles(message=newMessage ,time=nowConvert, status=True)
+
+        for i in range(10):
+            newBlink.ledOn(0.5)
+            newBlink.ledOff(0.5)
+    except:
+        newBlink.ledOff()
+
+
+
+def main():
+    #schedule.every().hour.at(":27").do(simpleJob)
+    schedule.every(2).minutes.do(simpleJob)
+    while True:
+        schedule.run_pending()
+        time.sleep(1)
+
+
+
+
+if __name__ == "__main__":
+    main()
diff --git a/service/files.py b/service/files.py
@@ -11,13 +11,14 @@
 
 
 def manageFiles(logsFile="logs.txt", message='New data added on:', time='No time', status=False):
-    if(status):
+    if status:
         statusData = 'Data Send'
     else:
         statusData = 'No Data Send'
     with open(logsFile, 'a') as file:
+        if '00:01' in time:
+            file.write("New data day  --  \n")
         file.write("{} {}  --  Status: {} \n" .format(message, time, statusData))
-        #print('ok')
 
 
 def currentTime():

diff --git a/service/firebase.py b/service/firebase.py
@@ -9,7 +9,7 @@
 
 
 def validateAccount():
-    serviceAccount="telemetryiot-firebase-adminsdk-ip9yj-d5e016348c.json"
+    serviceAccount="/home/pi/iot/service/telemetryiot-firebase-adminsdk-ip9yj-d5e016348c.json"
     cred = credentials.Certificate(serviceAccount)
     firebase_admin.initialize_app(cred)
 

diff --git a/service/iotFirebase.service b/service/iotFirebase.service
@@ -1,5 +1,5 @@
 [Unit]
-Description=Mi Service cron Iot data for send data to Firebase
+Description=Service cron Iot data for send data to Firebase
 After=multi-user.target
 
 [Service]

diff --git a/service/logs.txt b/service/logs.txt
@@ -2,3 +2,40 @@ New data added on: 29/08/2020 22:35:13  --  Status: No Data Send
 New data added on: 30/08/2020 03:03:53  --  Status: Data Send 
 New data added on: 30/08/2020 03:28:10  --  Status: Data Send 
 New data added on: 30/08/2020 03:32:10  --  Status: Data Send 
+New data added on: 30/08/2020 13:35:10  --  Status: Data Send 
+New data added on: 30/08/2020 15:11:03  --  Status: Data Send 
+New data added on: 30/08/2020 15:14:54  --  Status: Data Send 
+New data added on: 30/08/2020 15:18:45  --  Status: Data Send 
+New data added on: 30/08/2020 15:22:35  --  Status: Data Send 
+New data added on: 30/08/2020 15:26:26  --  Status: Data Send 
+New data added on: 30/08/2020 15:30:16  --  Status: Data Send 
+New data added on: 30/08/2020 15:34:07  --  Status: Data Send 
+New data added on: 30/08/2020 15:37:57  --  Status: Data Send 
+New data added on: 30/08/2020 15:41:48  --  Status: Data Send 
+New data added on: 30/08/2020 15:45:39  --  Status: Data Send 
+New data added on: 30/08/2020 15:49:29  --  Status: Data Send 
+New data added on: 30/08/2020 15:53:20  --  Status: Data Send 
+New data added on: 30/08/2020 15:57:10  --  Status: Data Send 
+New data added on: 30/08/2020 16:01:01  --  Status: Data Send 
+New data added on: 30/08/2020 16:04:51  --  Status: Data Send 
+New data added on: 30/08/2020 16:08:42  --  Status: Data Send 
+New data added on: 30/08/2020 16:27:10  --  Status: Data Send 
+New data added on: 30/08/2020 17:27:10  --  Status: Data Send 
+New data added on: 30/08/2020 18:27:10  --  Status: Data Send 
+New data added on: 30/08/2020 19:27:10  --  Status: Data Send 
+New data added on: 30/08/2020 20:27:10  --  Status: Data Send 
+New data added on: 30/08/2020 21:27:10  --  Status: Data Send 
+New data added on: 30/08/2020 22:27:10  --  Status: Data Send 
+New data added on: 30/08/2020 23:27:10  --  Status: Data Send 
+New data added on: 31/08/2020 00:27:10  --  Status: Data Send 
+New data added on: 31/08/2020 00:43:58  --  Status: Data Send 
+New data added on: 31/08/2020 00:46:49  --  Status: Data Send 
+New data added on: 31/08/2020 00:49:40  --  Status: Data Send 
+New data added on: 31/08/2020 00:52:30  --  Status: Data Send 
+New data added on: 31/08/2020 00:55:21  --  Status: Data Send 
+New data added on: 31/08/2020 00:58:11  --  Status: Data Send 
+New data added on: 31/08/2020 01:01:01  --  Status: Data Send 
+New data added on: 31/08/2020 01:03:52  --  Status: Data Send 
+New data added on: 31/08/2020 01:21:08  --  Status: Data Send 
+New data added on: 31/08/2020 01:23:29  --  Status: Data Send 
+New data added on: 31/08/2020 01:38:05  --  Status: Data Send 
diff --git a/service/main.py b/service/main.py
@@ -7,71 +7,43 @@
 import firebase
 import calculation
 
-
+firebase.validateAccount()
+#ledPin = 11
+newBlink = blink()
 
 
 def simpleJob():
 
-    #ledPin = 11
-    newBlink = blink()
-
-    for i in range(10):
-        newBlink.ledOn(0.5)
-        newBlink.ledOff(0.5)
-
-    #Get dateTime Now
-    currentDatetime = files.currentTime()
-    #Diccionario - firebase
-    nodes = firebase.dicNodes(currentDatetime, calculation.genereRandomList(), calculation.genereRandomList(), calculation.genereRandomList(), calculation.genereRandomList(), calculation.genereRandomList())
-    firebase.validateAccount()
-    firebase.insertData(nodes)
-    #Add to logs.txt
-    newMessage = 'New data added on:'
-    nowConvert = files.dateTimeConvert(currentDatetime)
-    files.manageFiles(message=newMessage ,time=nowConvert, status=True)
-
-    for i in range(10):
-        newBlink.ledOn(2)
-        newBlink.ledOff(2)
+    try:
+        for i in range(10):
+            newBlink.ledOn(0.5)
+            newBlink.ledOff(0.5)
+
+        #Get dateTime Now
+        currentDatetime = files.currentTime()
+        #Diccionario - firebase
+        nodes = firebase.dicNodes(currentDatetime, calculation.genereRandomList(), calculation.genereRandomList(), calculation.genereRandomList(), calculation.genereRandomList(), calculation.genereRandomList())
+        #firebase.validateAccount()
+        firebase.insertData(nodes)
+        #Add to logs.txt
+        newMessage = 'New data added on:'
+        nowConvert = files.dateTimeConvert(currentDatetime)
+        files.manageFiles(message=newMessage ,time=nowConvert, status=True)
+
+        for i in range(10):
+            newBlink.ledOn(0.5)
+            newBlink.ledOff(0.5)
+    except:
+        newBlink.ledOff()
 
 
 
 def main():
-    try:
-        schedule.every().day.at("00:00").do(simpleJob)
-        schedule.every().day.at("01:00").do(simpleJob)
-        schedule.every().day.at("02:00").do(simpleJob)
-        schedule.every().day.at("03:00").do(simpleJob)
-        schedule.every().day.at("04:00").do(simpleJob)
-        schedule.every().day.at("05:00").do(simpleJob)
-        schedule.every().day.at("06:00").do(simpleJob)
-        schedule.every().day.at("07:00").do(simpleJob)
-        schedule.every().day.at("08:00").do(simpleJob)
-        schedule.every().day.at("09:00").do(simpleJob)
-        schedule.every().day.at("10:00").do(simpleJob)
-        schedule.every().day.at("11:00").do(simpleJob)
-        schedule.every().day.at("12:00").do(simpleJob)
-        schedule.every().day.at("13:00").do(simpleJob)
-        schedule.every().day.at("13:00").do(simpleJob)
-        schedule.every().day.at("14:00").do(simpleJob)
-        schedule.every().day.at("15:00").do(simpleJob)
-        schedule.every().day.at("16:00").do(simpleJob)
-        schedule.every().day.at("17:00").do(simpleJob)
-        schedule.every().day.at("18:00").do(simpleJob)
-        schedule.every().day.at("19:00").do(simpleJob)
-        schedule.every().day.at("20:00").do(simpleJob)
-        schedule.every().day.at("21:00").do(simpleJob)
-        schedule.every().day.at("22:00").do(simpleJob)
-        schedule.every().day.at("23:00").do(simpleJob)
-
-        while True:
-            schedule.run_pending()
-            time.sleep(1)
-    except:
-        newBlinkExcept = blink()
-        newBlinkExcept.ledOff()
-    finally:
-        print ("Cron Script Stopped")
+    schedule.every().hour.at(":01").do(simpleJob)
+    #schedule.every(2).minutes.do(simpleJob)
+    while True:
+        schedule.run_pending()
+        time.sleep(1)
 
 
 

diff --git a/service/service.txt b/service/service.txt
@@ -103,3 +103,7 @@ pip install paho-mqtt
 
 
 
+PARA GESTOR DE PAQUETES DEL PROYECTO
+pip install -r requirements.txt
+
+GESTOR DE PAQUETES - PIPENV
diff --git a/service/simple.py b/service/simple.py
@@ -0,0 +1,51 @@
+#!/usr/bin/python3
+import os
+import schedule
+from blink import blink
+import time
+import files
+import firebase
+import calculation
+
+firebase.validateAccount()
+#ledPin = 11
+newBlink = blink()
+
+def simpleJob():
+
+    try:
+
+        for i in range(10):
+            newBlink.ledOn(0.5)
+            newBlink.ledOff(0.5)
+
+        #Get dateTime Now
+        currentDatetime = files.currentTime()
+        #Diccionario - firebase
+        nodes = firebase.dicNodes(currentDatetime, calculation.genereRandomList(), calculation.genereRandomList(), calculation.genereRandomList(), calculation.genereRandomList(), calculation.genereRandomList())
+        #firebase.validateAccount()
+        firebase.insertData(nodes)
+        #Add to logs.txt
+        newMessage = 'New data added on:'
+        nowConvert = files.dateTimeConvert(currentDatetime)
+        files.manageFiles(message=newMessage ,time=nowConvert, status=True)
+
+        for i in range(10):
+            newBlink.ledOn(2)
+            newBlink.ledOff(2)
+
+    except:
+        newBlink.ledOff()
+
+
+
+def main():
+    #schedule.every().hour.at(":27").do(simpleJob)
+    schedule.every(2).minutes.do(simpleJob)
+    while True:
+        schedule.run_pending()
+        time.sleep(1)
+
+
+if __name__ == "__main__":
+    main()
Original file line number	Diff line number	Diff line change
Expand Up		@@ -103,3 +103,7 @@ pip install paho-mqtt



		PARA GESTOR DE PAQUETES DEL PROYECTO
		pip install -r requirements.txt

		GESTOR DE PAQUETES - PIPENV