From b072f89bdb919c6e52979ee263177f6cc9d23e15 Mon Sep 17 00:00:00 2001 From: Simon Date: Sat, 21 May 2022 18:18:51 +0100 Subject: [PATCH] Update SQL loader --- report_sql.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/report_sql.py b/report_sql.py index 92ccf99..f3cd950 100644 --- a/report_sql.py +++ b/report_sql.py @@ -68,10 +68,12 @@ class reportClient(NetstringReceiver): 'subid' : datalist[6], 'slot' : datalist[7], 'dstid' : datalist[8], - 'duration' : 0 + 'duration' : 0, + 'source_server': 0, + 'source_rptr': 0 } - if len(datalist) > 9: + if len(datalist) > 11: event['duration'] = datalist[9] @@ -86,10 +88,10 @@ class reportClient(NetstringReceiver): except mysql.connector.Error as err: print('(MYSQL) error on reconnect: {}'.format(err)) - print("{} {} {} {} {} {} {} {} {}".format(event['type'],event['event'], event['trx'],event['system'],event['streamid'],event['peerid'],event['subid'],event['slot'],event['dstid'],event['duration'])) + print("{} {} {} {} {} {} {} {} {} {} {}".format(event['type'],event['event'], event['trx'],event['system'],event['streamid'],event['peerid'],event['subid'],event['slot'],event['dstid'],event['duration'], event['source_server'],event['source_rptr'])) _cursor = self.db.cursor() try: - _cursor.execute("insert into feed values (NULL,'{}','{}','{}','{}','{}','{}','{}','{}','{}','{}')".format(event['type'],event['event'], event['trx'],event['system'],event['streamid'],event['peerid'],event['subid'],event['slot'],event['dstid'],event['duration'])) + _cursor.execute("insert into feed values (NULL,'{}','{}','{}','{}','{}','{}','{}','{}','{}','{},{},{}')".format(event['type'],event['event'], event['trx'],event['system'],event['streamid'],event['peerid'],event['subid'],event['slot'],event['dstid'],event['duration'],event['source_server'],event['source_rptr'])) self.db.commit() except mysql.connector.Error as err: _cursor.close()