X-Git-Url: https://git.rvb.name/weathermon.git/blobdiff_plain/3a48d89e76fd2ab87dabf08632474c529cf77ad4..ee2fccf67428124c6ae125e5c35064c6ccae7a7b:/weathermon diff --git a/weathermon b/weathermon index 8c94dd0..7b78ca7 100755 --- a/weathermon +++ b/weathermon @@ -2,9 +2,11 @@ import serial -from os import listdir +from os import listdir,system from os.path import isfile, join +from pprint import pprint + from termios import tcflush, TCIOFLUSH from time import sleep,time @@ -22,12 +24,15 @@ from urllib import urlencode from StringIO import StringIO searchpath = '/dev/serial/by-id/' -baud = 9600 +baud = 57600 +path = None timeout = 5 external_submit_interval = 320 +owm_submit_interval = 320 expire_interval = 1200 submit_time = time() +submit_time_owm = time() submit_queue = {} import MySQLdb @@ -36,6 +41,7 @@ import ConfigParser def find_port(): global serial_num + global path files = listdir(searchpath) for f in files: @@ -68,17 +74,25 @@ def read_loop(ser,callback): finally: None +def print_log(str): + global logging + print str + if logging == "on": + system("logger -t weathermon \""+str+"\"") + def submit_narodmon(queue): param = { 'ID':"{:X}".format(getnode())} + pprint(queue) + for sensor in queue: value = submit_queue[sensor]['val'] timestamp = submit_queue[sensor]['timestamp'] digest = md5(sensor).hexdigest()[:18] param[digest] = value; - print param + pprint (param) url = "http://narodmon.ru/post.php" @@ -97,7 +111,7 @@ def submit_narodmon(queue): response_value = response_buffer.getvalue() - print 'Content: ', response_value + print_log('Narodmon response: '+response_value) return True @@ -137,7 +151,7 @@ def submit_owm(queue): response_value = response_buffer.getvalue() - print 'Content: ', response_value + print_log('Openweathermap response: '+response_value) return True @@ -154,34 +168,41 @@ def purge_queue(): clean = [] for key in submit_queue: if submit_queue[key]['timestamp'] < time()-expire_interval: - print "Expired value for "+key + print_log("Expired value for "+key) clean.append(key) for i in clean: del submit_queue[i] def submit_data(sensor_type,sensor_id,sensor_param,param_value): global submit_time + global submit_time_owm + global external_submit_interval + global owm_submit_interval global submit_queue c = database.cursor() - c.execute('CALL meteo.submit_value(%s,%s,%s,%s)', (sensor_type,sensor_id,sensor_param,param_value)) + c.execute('CALL meteo.submit_value(%s,%s,%s,%s,NULL)', (sensor_type,sensor_id,sensor_param,param_value)) database.commit() submit_queue[sensor_type+'.'+sensor_id+'.'+sensor_param]={'val':param_value,'timestamp':time()} if time()>submit_time+external_submit_interval: - if submit_narodmon(submit_queue): - if owmuser: - submit_owm(submit_queue) - print 'Purging queue...' - submit_time=time() - purge_queue() + submit_narodmon(submit_queue) + submit_time=time() + if owmuser and time()>submit_time_owm+owm_submit_interval: + submit_owm(submit_queue) + submit_time_owm=time() + purge_queue() def process_str(str): + print_log("Received: "+str) try: msg_type, msg_body = str.split(':') + except: + return + try: if msg_type == 'STATUS': - print 'Status: ', msg_body + print_log('Status: '+msg_body) elif msg_type == 'ERROR': - print 'Error: ', msg_body + print_log('Error: '+ msg_body) elif msg_type == 'SENSOR': sens = msg_body.split(',') sensor = {} @@ -199,40 +220,52 @@ def process_str(str): if not sensor_id: sensor_id='DEFAULT'; for key in sensor: - print 'Type = ', sensor_type, ', ID = ', sensor_id, ', Param = ', key, ', Value = ', sensor[key] - submit_data(sensor_type,sensor_id,key,sensor[key]) + if sensor[key] is not None: + print_log('Type = '+sensor_type+', ID = '+sensor_id+', Param = '+key+', Value = '+sensor[key]) + submit_data(sensor_type,sensor_id,key,sensor[key]) + else: + print_log('Error: got empty parameter value for '+sensor_type+'.'+sensor_id+'.'+key) except: - print 'Exception processing...' + print_log('Exception processing...') + exc_type, exc_value, exc_traceback = sys.exc_info() + traceback.print_tb(exc_traceback, limit=1, file=sys.stdout) + traceback.print_exception(exc_type, exc_value, exc_traceback, + limit=5, file=sys.stdout) try: database.close() except: None reconnect() -def print_str(str): - print str - def weather_mon(): - path = find_port() + global path + + if path is None: + path = find_port() ser = open_port(path) read_loop(ser,process_str) def reconnect(): - - try: - global database - database = MySQLdb.connect(host=dbhost,user=dbuser,passwd=dbpasswd,use_unicode=True,connect_timeout=10) - database.set_character_set('utf8') - c = database.cursor() - c.execute('SET NAMES utf8;') - print "Database connected..." - - except: + connected = False + + while not connected: + + try: + + global database + database = MySQLdb.connect(host=dbhost,user=dbuser,passwd=dbpasswd,use_unicode=True,connect_timeout=10) + database.set_character_set('utf8') + c = database.cursor() + c.execute('SET NAMES utf8;') + print_log("Database connected...") + connected = True + + except: - print "Error connecting database" - sleep(30) + print_log("Error connecting database") + sleep(30) def main(): weather_mon() @@ -244,7 +277,18 @@ try: dbhost = cfg.get("mysql","host") dbuser = cfg.get("mysql","user") dbpasswd = cfg.get("mysql","passwd") - serialnum = cfg.get("serial","id") + try: + path = cfg.get("serial","port"); + except: + path = None + try: + serialnum = cfg.get("serial","id") + except: + serialnum = None + try: + logging = cfg.get("logging","enabled") + except: + logging = None owmuser = cfg.get("openweathermap","user") owmpasswd = cfg.get("openweathermap",'passwd') if owmuser: @@ -258,7 +302,7 @@ try: except: - print "Cannot intialize system" + print_log("Cannot intialize system") exit() if __name__ == "__main__":