Skip to content

Commit 23e7044

Browse files
committed
ensure that LogDNA module recovers after internet reconnects
1 parent 20b2ecc commit 23e7044

3 files changed

Lines changed: 23 additions & 8 deletions

File tree

logdna/logdna.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,9 +77,13 @@ def flush(self):
7777
self.buf = self.buf + self.secondary;
7878
self.secondary = [];
7979
except requests.exceptions.RequestException as e:
80+
if self.flusher:
81+
self.flusher.cancel()
82+
self.flusher = None
8083
self.lock.release();
8184
logger.error('Error in request to LogDNA: ' + str(e))
8285

86+
8387
def emit(self, record):
8488
msg = self.format(record)
8589
record = record.__dict__

setup.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22
setup(
33
name = 'logdna',
44
packages = ['logdna'],
5-
version = '1.1.2',
5+
version = '1.1.4',
66
description = 'A python package for sending logs to LogDNA',
77
author = 'Answerbook Inc.',
88
author_email = 'help@logdna.com',
99
url = 'https://github.com/logdna/python',
10-
download_url = 'https://github.com/logdna/python/tarball/1.1.2',
10+
download_url = 'https://github.com/logdna/python/tarball/1.1.4',
1111
keywords = ['logdna', 'logging', 'logs', 'python', 'logdna.com', 'logger'],
1212
install_requires=[
1313
'requests',

test.py

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,9 @@
55
import logging
66
import timeit
77
import sys
8+
import time
89

9-
from logdna import LogDNAHandler
10+
from logdna.logdna import LogDNAHandler
1011

1112
# from guppy import hpy
1213
# h = hpy()
@@ -24,10 +25,20 @@
2425

2526
# Lines will be in order upon refresh
2627
def timeThis():
27-
for x in range(100):
28-
log.info('DINGLEBOP ' + str(x))
29-
log.info('%s before you %s', 'Look', 'Leap')
30-
31-
print (timeit.timeit(timeThis, number=2))
28+
for x in range(7):
29+
log.info('GORPGORP ' + str(x))
30+
#log.info('%s before you %s', 'Look', 'Leap')
31+
32+
def main_loop():
33+
while 1:
34+
print (timeit.timeit(timeThis, number=2))
35+
time.sleep(10)
36+
37+
if __name__ == '__main__':
38+
try:
39+
main_loop()
40+
except KeyboardInterrupt:
41+
print >> sys.stderr, '\nExiting by user request.\n'
42+
sys.exit(0)
3243

3344
# print h.heap()

0 commit comments

Comments
 (0)