X-Git-Url: http://average.org/gitweb/?a=blobdiff_plain;f=gps303%2Fevstore.py;h=70a3ac6618bec9bd67f53ff7fa9a30a6d92484c4;hb=5fb0153ac3c0d8b0986575aa23f6f33a17512031;hp=9bc60d5594a1f7656360fff741cbe1470ed346ab;hpb=4aaa5cd899d6b2bb9fd5e90dfac3d43461394e9b;p=loctrkd.git

diff --git a/gps303/evstore.py b/gps303/evstore.py
index 9bc60d5..70a3ac6 100644
--- a/gps303/evstore.py
+++ b/gps303/evstore.py
@@ -1,42 +1,44 @@
-from logging import getLogger
-from sqlite3 import connect
+""" sqlite event store """
 
-__all__ = ("initdb", "stow")
+from sqlite3 import connect
 
-log = getLogger("gps303")
+__all__ = "initdb", "stow"
 
 DB = None
 
 SCHEMA = """create table if not exists events (
-    timestamp real not null,
+    tstamp real not null,
     imei text,
-    clntaddr text not null,
-    length int,
+    peeraddr text not null,
     proto int not null,
-    payload blob
+    packet blob
 )"""
 
 
 def initdb(dbname):
     global DB
-    log.info('Using Sqlite3 database "%s"', dbname)
     DB = connect(dbname)
     DB.execute(SCHEMA)
 
 
-def stow(clntaddr, timestamp, imei, length, proto, payload):
+def stow(**kwargs):
     assert DB is not None
-    parms = dict(
-        zip(
-            ("clntaddr", "timestamp", "imei", "length", "proto", "payload"),
-            (str(clntaddr), timestamp, imei, length, proto, payload),
+    parms = {
+        k: kwargs[k] if k in kwargs else v
+        for k, v in (
+            ("peeraddr", None),
+            ("when", 0.0),
+            ("imei", None),
+            ("proto", -1),
+            ("packet", b""),
         )
-    )
+    }
+    assert len(kwargs) <= len(parms)
     DB.execute(
         """insert or ignore into events
-                (timestamp, imei, clntaddr, length, proto, payload)
+                (tstamp, imei, peeraddr, proto, packet)
                 values
-                (:timestamp, :imei, :clntaddr, :length, :proto, :payload)
+                (:when, :imei, :peeraddr, :proto, :packet)
         """,
         parms,
     )