diff --git a/telemetry/autorun/rebootLogger.py b/telemetry/autorun/rebootLogger.py index 447ab85..2e917d7 100644 --- a/telemetry/autorun/rebootLogger.py +++ b/telemetry/autorun/rebootLogger.py @@ -6,7 +6,7 @@ sys.path.append(os.path.abspath('/home/pi/telemetry/')) from functions import send_email -from environent_config import wxoutside_sensor_name +from environment_config import wxoutside_sensor_name date=time.strftime("%Y-%m-%d %H:%M") @@ -15,8 +15,10 @@ print ('Message: System restarted at ' + str(date)) header='v1/' + str(wxoutside_sensor_name) + "/system event/" + str(date) + "\n" + body="Action: system restarted\n" -body=body + + 'Time: ' + str(date) + "\n"; +body=body + 'Time: ' + str(date) + "\n"; body=body + 'Message: System restarted at ' + str(date) + "\n" +body=body + "Code: 100\n" send_email('System event response', header + body) \ No newline at end of file diff --git a/telemetry/cron/logger.py b/telemetry/cron/logger.py index 5d6adf4..b300d51 100644 --- a/telemetry/cron/logger.py +++ b/telemetry/cron/logger.py @@ -22,7 +22,7 @@ def modification_date(filename): host_name=socket.gethostname() -logs=['am2315', 'aquaflex', 'compaction', 'rebootLogger', 'updateCode', 'weatherPiArduino_controller'] +logs=['am2315', 'aquaflex', 'compaction', 'rebootLogger', 'updateCode', 'weatherPiArduino'] for log_name in logs: filepath='/home/pi/telemetry/logs/' + str(log_name) + '.*.log' @@ -37,8 +37,9 @@ def modification_date(filename): modified_date=modification_date(textfile) - header=str(version) + '/' + str(log_name) + '/' + str(modified_date) + '/' + str(host_name) + "\n" - + #header=str(version) + '/' + str(log_name) + '/' + str(modified_date) + '/' + str(host_name) + "\n" + header=str(version) + '/' + str(host_name) + '/' + str(log_name) + '/' + str(modified_date) + "\n" + server = smtplib.SMTP(wxoutside_email_server, wxoutside_email_port) server.starttls() server.login(wxoutside_sensor_email, wxoutside_sensor_password) diff --git a/telemetry/cron/sendTelemetry.py b/telemetry/cron/sendTelemetry.py index 91c64a1..1eb2758 100644 --- a/telemetry/cron/sendTelemetry.py +++ b/telemetry/cron/sendTelemetry.py @@ -41,7 +41,6 @@ if valid==True and email_sent==False: json_items=values - #header=str(version) + '/' + str(date) + '/' + str(hour) + '/' + str(host_name) + "\n" header=str(version) + '/' + host_name + '/telemetry/' + str(date) + ' ' + str(hour) + ':00' + "\n" for value_item in values: diff --git a/telemetry/cron/updateCode.py b/telemetry/cron/updateCode.py index 4efc164..ed2d248 100644 --- a/telemetry/cron/updateCode.py +++ b/telemetry/cron/updateCode.py @@ -26,7 +26,13 @@ def get_latest(url): try: r = requests.get(url, stream=True) z = zipfile.ZipFile(StringIO.StringIO(r.content)) - z.extractall(path='/home/pi/telemetry/releases') + + releases_path='/home/pi/telemetry/releases' + + if not os.path.exists(releases_path): + os.makedirs(releases_path) + + z.extractall(path=releases_path) return True diff --git a/telemetry/misc/crontab.master b/telemetry/misc/crontab.master index 23856cb..5c7d814 100644 --- a/telemetry/misc/crontab.master +++ b/telemetry/misc/crontab.master @@ -24,11 +24,11 @@ # Run sensors: 1 * * * * /usr/bin/python3 /home/pi/telemetry/sensors/am2315.py > /home/pi/telemetry/logs/am2315.`date +\%Y\%m\%d\%H\%M\%S`.log 2>&1 1 * * * * /usr/bin/python /home/pi/telemetry/sensors/aquaflex.py > /home/pi/telemetry/logs/aquaflex.`date +\%Y\%m\%d\%H\%M\%S`.log 2>&1 -2 * * * * /usr/bin/python /home/pi/telemetry/sensors/weatherPiArduino/weatherPiArduino_controller.py > /home/pi/telemetry/logs/weatherPiArduino.`date +\%Y\%m\%d\%H\%M\%S`.log 2>&1 +2 * * * * /usr/bin/python /home/pi/telemetry/sensors/weatherPiArduino/weatherPiArduino_controller.py > /home/pi/telemetry/logs/weatherPiArduino_controller.`date +\%Y\%m\%d\%H\%M\%S`.log 2>&1 # minute 10 reserved for hardware stats 30 * * * * /usr/bin/python3 /home/pi/telemetry/sensors/am2315.py > /home/pi/telemetry/logs/am2315.`date +\%Y\%m\%d\%H\%M\%S`.log 2>&1 -31 * * * * /usr/bin/python /home/pi/telemetry/sensors/weatherPiArduino/weatherPiArduino_controller.py > /home/pi/telemetry/logs/weatherPiArduino.`date +\%Y\%m\%d\%H\%M\%S`.log 2>&1 +31 * * * * /usr/bin/python /home/pi/telemetry/sensors/weatherPiArduino/weatherPiArduino_controller.py > /home/pi/telemetry/logs/weatherPiArduino_controller.`date +\%Y\%m\%d\%H\%M\%S`.log 2>&1 # Notifications: 51 * * * * /usr/bin/python /home/pi/telemetry/cron/sendHardwareStats.py > /home/pi/telemetry/logs/sendHardwareStats.log 2>&1 diff --git a/telemetry/sensors/weatherPiArduino/weatherPiArduino_controller.py b/telemetry/sensors/weatherPiArduino/weatherPiArduino_controller.py index 955b27c..79848af 100644 --- a/telemetry/sensors/weatherPiArduino/weatherPiArduino_controller.py +++ b/telemetry/sensors/weatherPiArduino/weatherPiArduino_controller.py @@ -6,7 +6,6 @@ import time sys.path.append(os.path.abspath('/home/pi/telemetry/')) - from functions import date_time process_found=False @@ -22,8 +21,8 @@ full_date=str(date) + ' ' + str(hour) + ':' + str(minutes) print ('Time: ' + full_date) - print ('Code: 200') + print ('Code: 100') print ('Message: Script already running') exit() -os.system("/home/pi/telemetry/sensors/weatherPiArduino/weatherPiArduino_agent.py") +os.system("/home/pi/telemetry/sensors/weatherPiArduino/weatherPiArduino_agent.py") \ No newline at end of file