Исправлена ошибка при пустом (но не null) имени топика.

[weathermon.git] / weathermon-mqtt

diff --git a/weathermon-mqtt b/weathermon-mqtt
index 1d96410178be7c4a5817876d79ffcd0d9088e46e..c6b6a82db1f6959e4bd297eb0fb868f5d09551de 100755 (executable)
--- a/weathermon-mqtt
+++ b/weathermon-mqtt
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python -u

 
 import paho.mqtt.client as paho
 import sys
 
 import paho.mqtt.client as paho
 import sys


@@ -14,24 +14,27 @@ def on_message(mosq, obj, msg):
   payload=json.loads(msg.payload)
   timestamp=tparser.parse(payload['Time'])
   for sensor_type in payload:
   payload=json.loads(msg.payload)
   timestamp=tparser.parse(payload['Time'])
   for sensor_type in payload:

-    if sensor_type != 'Time':
+    if sensor_type != 'Time' and sensor_type != 'TempUnit':

       sensor_data=payload[sensor_type]
       for param in sensor_data:
         try:
           value=sensor_data[param]
       sensor_data=payload[sensor_type]
       for param in sensor_data:
         try:
           value=sensor_data[param]

-          c = database.cursor()
-          c.execute('CALL meteo.submit_mqtt(%s,%s,%s,%s,NULL)', (topic,sensor_type,param,value))
-          database.commit()
-          print topic,sensor_type,param,value
+          try:
+            c = database.cursor()
+            c.execute('CALL meteo.submit_mqtt(%s,%s,%s,%s,NULL)', (topic,sensor_type,param,value))
+            database.commit()
+            print topic,sensor_type,param,value
+          except:
+            print "Failed to submit data"

         except:
         except:

-          print "Failed to submit data"  
+          None    

 
 def Topics():
 
   c = database.cursor()
   c.execute(
     '''
 
 def Topics():
 
   c = database.cursor()
   c.execute(
     '''

-    select topic from mqtt_topics
+    select topic from mqtt_topics where topic<>""

     '''
   )
 
     '''
   )