diff options
| -rwxr-xr-x | neohub2pgsql.py | 17 | ||||
| -rw-r--r-- | todb.py | 3 |
2 files changed, 4 insertions, 16 deletions
diff --git a/neohub2pgsql.py b/neohub2pgsql.py index 0c760e5..646fa60 100755 --- a/neohub2pgsql.py +++ b/neohub2pgsql.py @@ -4,15 +4,10 @@ import os import asyncio import neohubapi.neohub as neohub -import psycopg2 +from todb import todb neohub_ip = os.environ['el_neohub_ip'] neohub_port = os.environ['el_neohub_port'] -pg_db = os.environ['el_pg_db'] -pg_host = os.environ['el_pg_host'] -pg_user = os.environ['el_pg_user'] -pg_pass = os.environ['el_pg_pass'] -pg_table = "neohub" values = [] @@ -29,12 +24,4 @@ async def run(): asyncio.run(run()) -conn = psycopg2.connect(database=pg_db, host=pg_host, user=pg_user, password=pg_pass) -cur = conn.cursor() - -try: - cur.executemany("INSERT INTO " + pg_table + " (time, device_id, away, heat_mode, heat_on, current_floor_temperature, target_temperature, temperature) VALUES(%s,%s,%s,%s,%s,%s,%s,%s)", values) - conn.commit() -except Exception as e: - conn.rollback() - raise e +todb("INSERT INTO neohub (time, device_id, away, heat_mode, heat_on, current_floor_temperature, target_temperature, temperature) VALUES(%s,%s,%s,%s,%s,%s,%s,%s)", values) @@ -11,7 +11,8 @@ pg_pass = os.environ['el_pg_pass'] def todb(sql, values): with psycopg.connect(dbname=pg_db, host=pg_host, user=pg_user, password=pg_pass) as conn: if type(values) == list: - conn.executemany(sql, values) + cur = conn.cursor() + cur.executemany(sql, values) elif type(values) == tuple: conn.execute(sql, values) else: |