From c6220244a5c878f1ac55141fa64df7b244aa67d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pavel=20K=C3=A1cha?= <ph@cesnet.cz>
Date: Fri, 23 Jun 2017 15:54:39 +0200
Subject: [PATCH] Update to more strict MySQLdb API (thx to bodik@cesnet.cz)
---
warden3/warden_server/warden_server.py | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/warden3/warden_server/warden_server.py b/warden3/warden_server/warden_server.py
index ba4d95d..fa279b7 100755
--- a/warden3/warden_server/warden_server.py
+++ b/warden3/warden_server/warden_server.py
@@ -757,7 +757,7 @@ class MySQL(ObjectBase):
def getLastReceivedId(self, client):
- res = self.query("SELECT event_id as id FROM last_events WHERE client_id = %s ORDER BY last_events.id DESC LIMIT 1", client.id, commit=True).fetchall()
+ res = self.query("SELECT event_id as id FROM last_events WHERE client_id = %s ORDER BY last_events.id DESC LIMIT 1", (client.id,), commit=True).fetchall()
try:
row = res[0]
except IndexError:
@@ -791,15 +791,15 @@ class MySQL(ObjectBase):
def purge_lastlog(self, days):
try:
- self.query(
+ crs = self.query(
"DELETE FROM last_events "
" USING last_events LEFT JOIN ("
" SELECT MAX(id) AS last FROM last_events"
" GROUP BY client_id"
" ) AS maxids ON last=id"
" WHERE timestamp < DATE_SUB(CURDATE(), INTERVAL %s DAY) AND last IS NULL",
- days)
- affected = self.con.affected_rows()
+ (days,))
+ affected = crs.rowcount
self.con.commit()
except Exception as e:
self.con.rollback()
@@ -809,10 +809,10 @@ class MySQL(ObjectBase):
def purge_events(self, days):
try:
- self.query(
+ crs = self.query(
"DELETE FROM events WHERE received < DATE_SUB(CURDATE(), INTERVAL %s DAY)",
- days)
- affected = self.con.affected_rows()
+ (days,))
+ affected = crs.rowcount
self.con.commit()
except Exception as e:
self.con.rollback()
--
GitLab