diff mbox series

[2/2] openvpn: Store connection times in ASCII timestamps

Message ID 20200413115018.3115-2-michael.tremer@ipfire.org
State Accepted
Commit 616de0b48c411937697424fdbb881ffad27583b0
Headers
Series [1/2] openvpn: Add metrics script |

Commit Message

Michael Tremer April 13, 2020, 11:50 a.m. UTC 
  This format seems to be a lot easier to handle in SQLite queries.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---
 src/scripts/openvpn-metrics | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)
diff mbox series

Patch

diff --git a/src/scripts/openvpn-metrics b/src/scripts/openvpn-metrics
index 30b3932c5..ac0cab909 100755
--- a/src/scripts/openvpn-metrics
+++ b/src/scripts/openvpn-metrics
@@ -114,8 +114,8 @@  class OpenVPNMetrics(object):
 		db.executescript("""
 			CREATE TABLE IF NOT EXISTS sessions(
 				common_name TEXT NOT NULL,
-				connected_at INTEGER NOT NULL,
-				duration INTEGER,
+				connected_at TEXT NOT NULL,
+				disconnected_at TEXT,
 				bytes_received INTEGER,
 				bytes_sent INTEGER
 			);
@@ -144,7 +144,7 @@  class OpenVPNMetrics(object):
 
 		c = self.db.cursor()
 		c.execute("INSERT INTO sessions(common_name, connected_at) \
-			VALUES(?, ?)", (common_name, time_unix))
+			VALUES(?, DATETIME(?, 'unixepoch'))", (common_name, time_unix))
 		self.db.commit()
 
 	def client_disconnect(self, args):
@@ -159,8 +159,9 @@  class OpenVPNMetrics(object):
 			% (common_name, duration, bytes_received, bytes_sent))
 
 		c = self.db.cursor()
-		c.execute("UPDATE sessions SET duration = ?, bytes_received = ?, \
-			bytes_sent = ? WHERE common_name = ? AND duration IS NULL",
+		c.execute("UPDATE sessions SET disconnected_at = DATETIME(connected_at, '+'  || ? || ' seconds'), \
+                        bytes_received = ?, bytes_sent = ? \
+                        WHERE common_name = ? AND disconnected_at IS NULL",
 			(duration, bytes_received, bytes_sent, common_name))
 		self.db.commit()