diff --git a/warden3/warden_server/warden_server.py b/warden3/warden_server/warden_server.py index ba4d95dd5592960e4e827957eaa17a0806a06fcd..fa279b7abccdc7fb198de8b7906c79aa1fb61aae 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()