From c1fa1445d4a45090403f057d1b5cfcc6aa467571 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matteo=20=E2=84=B1an?= Date: Sun, 6 Oct 2019 22:12:00 +0200 Subject: [PATCH] Add sys import, rename logger variable --- py-kms/pykms_Sql.py | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/py-kms/pykms_Sql.py b/py-kms/pykms_Sql.py index bb2aead..f19c299 100644 --- a/py-kms/pykms_Sql.py +++ b/py-kms/pykms_Sql.py @@ -2,6 +2,7 @@ import os import logging +import sys # sqlite3 is optional. try: @@ -11,7 +12,7 @@ except ImportError: #-------------------------------------------------------------------------------------------------------------------------------------------------------- -logger = logging.getLogger('root') +loggersrv = logging.getLogger('logsrv') def sql_initialize(): dbName = 'clients.db' @@ -25,7 +26,7 @@ def sql_initialize(): licenseStatus TEXT, lastRequestTime INTEGER, kmsEpid TEXT, requestCount INTEGER)") except sqlite3.Error as e: - logger.error("Error %s:" % e.args[0]) + loggersrv.error("Error %s:" % e.args[0]) sys.exit(1) finally: if con: @@ -62,9 +63,10 @@ skuId, licenseStatus, lastRequestTime, requestCount) VALUES (:clientMachineId, : cur.execute("UPDATE clients SET requestCount=requestCount+1 WHERE clientMachineId=:clientMachineId;", infoDict) except sqlite3.Error as e: - logger.error("Error %s:" % e.args[0]) + loggersrv.error("Error %s:" % e.args[0]) + sys.exit(1) except sqlite3.Error as e: - logger.error("Error %s:" % e.args[0]) + loggersrv.error("Error %s:" % e.args[0]) sys.exit(1) finally: if con: @@ -86,9 +88,10 @@ def sql_update_epid(dbName, kmsRequest, response): cur.execute("UPDATE clients SET kmsEpid=? WHERE clientMachineId=?;", (str(response["kmsEpid"].decode('utf-16le')), cmid)) except sqlite3.Error as e: - logger.error("Error %s:" % e.args[0]) + loggersrv.error("Error %s:" % e.args[0]) + sys.exit(1) except sqlite3.Error as e: - logger.error("Error %s:" % e.args[0]) + loggersrv.error("Error %s:" % e.args[0]) sys.exit(1) finally: if con: