X-Git-Url: https://git.toastfreeware.priv.at/chrisu/seepark.git/blobdiff_plain/40a723861570f3e613c908329305e98dcc1fc6f7..27c0f788b0d0dc5adbedae34bfe1d0f301c2d3ab:/seewasser.py

diff --git a/seewasser.py b/seewasser.py
index ecd67d6..5bf2ce2 100755
--- a/seewasser.py
+++ b/seewasser.py
@@ -8,7 +8,7 @@ import sys
 import csv
 import os
 import configparser
-from sqlalchemy import create_engine, exc
+from sqlalchemy import create_engine
 import warnings
 import MySQLdb.cursors
 
@@ -77,17 +77,11 @@ def writesensordatadb(config, sensor_id, sensor_name, timestamp, value_type, val
     engine = create_engine('mysql+mysqldb://{}:{}@{}/{}'.format(user, pwd, host, db), echo=False)
     conn = engine.connect()
     with warnings.catch_warnings():
-        # ignore _mysql_exceptions.IntegrityError: (1062, "Duplicate entry '0316a2193bff-2018-08-29 14:30:00' for key 'sensorid_timestamp'")
-        # TODO: the following doesn't work
+        # ignore _mysql_exceptions.Warning: Duplicate entry '0316a2193bff-2018-08-29 14:30:00' for key 'sensorid_timestamp'
         warnings.simplefilter("ignore", category=MySQLdb.cursors.Warning)
-        # TODO: this does but …?!
-        try:
-            conn.execute("insert into sensors (sensor_id, sensor_name, value_type, value_raw, value, timestamp) values (%s,%s,%s,%s,%s,%s)", sensor_id, sensor_name, value_type, value_raw, value, timestamp)
-        except exc.IntegrityError as e:
-            if "1062" in str(e):
-                pass
-            else:
-                raise
+        if args.verbose:
+            logging.info("Writing to database: sensor_id={}, sensor_name={}, value_type={}, value_raw={}, value={}, timestamp={}".format(sensor_id, sensor_name, value_type, value_raw, value, timestamp))
+        conn.execute("insert ignore into sensors (sensor_id, sensor_name, value_type, value_raw, value, timestamp) values (%s,%s,%s,%s,%s,%s)", sensor_id, sensor_name, value_type, value_raw, value, timestamp)
     conn.close()
 
 
@@ -123,6 +117,7 @@ if __name__ == '__main__':
     parser = argparse.ArgumentParser(description='Read sensor data')
     parser.add_argument('--config', default=default_config_file, help='configuration file')
     parser.add_argument('--fromcsvfile', help='write values from csv file to database')
+    parser.add_argument("--verbose", help='write some output', action='store_true')
     args = parser.parse_args()
     main(args.config, args.fromcsvfile)