copyleftie
/
gajim-plural
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ask sql to do the timeout check

This commit is contained in:
Nikos Kouremenos 2005-11-27 17:33:57 +00:00
parent 43bed46ba8
commit af9f4afe0c
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/common/logger.py
View File

@ -272,26 +272,22 @@ class Logger:
list with empty tupple if nothing found to meet our demands''' list with empty tupple if nothing found to meet our demands'''
jid = jid.lower() jid = jid.lower()
jid_id = self.get_jid_id(jid) jid_id = self.get_jid_id(jid)
now = int(float(time.time()))
timed_out = now - (timeout * 60) # before that they are too old
# so if we ask last 5 lines and we have 2 pending we get # so if we ask last 5 lines and we have 2 pending we get
# 3 - 8 (we avoid the last 2 lines but we still return 5 asked) # 3 - 8 (we avoid the last 2 lines but we still return 5 asked)
cur.execute(''' cur.execute('''
SELECT time, kind, message FROM logs SELECT time, kind, message FROM logs
WHERE jid_id = %d AND kind IN (%d, %d, %d, %d) WHERE jid_id = %d AND kind IN (%d, %d, %d, %d) AND time > %d
ORDER BY time DESC LIMIT %d OFFSET %d ORDER BY time DESC LIMIT %d OFFSET %d
''' % (jid_id, constants.KIND_SINGLE_MSG_RECV, constants.KIND_CHAT_MSG_RECV, ''' % (jid_id, constants.KIND_SINGLE_MSG_RECV, constants.KIND_CHAT_MSG_RECV,
constants.KIND_SINGLE_MSG_SENT, constants.KIND_CHAT_MSG_SENT, constants.KIND_SINGLE_MSG_SENT, constants.KIND_CHAT_MSG_SENT,
restore_how_many_rows, pending_how_many) timed_out, restore_how_many_rows, pending_how_many)
) )
results = cur.fetchall() results = cur.fetchall()
now = time.time() results.reverse()
true_results = [] # results that are not too old return results
for result in results:
if result[0] < (now - timeout*60): # fom here they are too old
break
true_results.append(result)
true_results.reverse()
return true_results
def get_unix_time_from_date(self, year, month, day): def get_unix_time_from_date(self, year, month, day):
# year (fe 2005), month (fe 11), day (fe 25) # year (fe 2005), month (fe 11), day (fe 25)