Skip to content
This repository was archived by the owner on Oct 9, 2021. It is now read-only.

Commit 853b7a8

Browse files
committed
always close sqlite connection even after exceptions
1 parent 16b00ff commit 853b7a8

2 files changed

Lines changed: 13 additions & 4 deletions

File tree

wakatime/offlinequeue.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,9 +60,12 @@ def push(self, heartbeat):
6060
}
6161
c.execute('INSERT INTO {0} VALUES (:id,:heartbeat)'.format(self.table_name), data)
6262
conn.commit()
63-
conn.close()
6463
except sqlite3.Error:
6564
log.traceback()
65+
try:
66+
conn.close()
67+
except: # pragma: nocover
68+
pass
6669

6770
def pop(self):
6871
if not HAS_SQL:

wakatime/session_cache.py

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,12 @@ def save(self, session):
5555
}
5656
c.execute('INSERT INTO {0} VALUES (:value)'.format(self.table_name), values)
5757
conn.commit()
58-
conn.close()
5958
except: # pragma: nocover
6059
log.traceback(logging.DEBUG)
60+
try:
61+
conn.close()
62+
except: # pragma: nocover
63+
pass
6164

6265
def get(self):
6366
"""Returns a requests.Session object.
@@ -87,7 +90,7 @@ def get(self):
8790
try:
8891
conn.close()
8992
except: # pragma: nocover
90-
log.traceback(logging.DEBUG)
93+
pass
9194

9295
return session if session is not None else requests.session()
9396

@@ -101,9 +104,12 @@ def delete(self):
101104
conn, c = self.connect()
102105
c.execute('DELETE FROM {0}'.format(self.table_name))
103106
conn.commit()
104-
conn.close()
105107
except:
106108
log.traceback(logging.DEBUG)
109+
try:
110+
conn.close()
111+
except: # pragma: nocover
112+
pass
107113

108114
def _get_db_file(self):
109115
home = '~'

0 commit comments

Comments
 (0)