daniell/routerstats
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Add info line on every 1000 lines

Browse Source
This commit is contained in:
Daniel Lysfjord
2024-07-03 20:40:08 +02:00
parent f04c10b4b4
commit 9e7425dbe6
2 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
routerstats_client.py
View File

@@ -27,6 +27,7 @@ class RouterstatsClient():
self.connected = False self.connected = False
self.sock = None self.sock = None
self.passwd_file = passwd_file self.passwd_file = passwd_file
self.received_lines = 0
def connect(self): def connect(self):
'''Do connect''' '''Do connect'''
@@ -37,6 +38,7 @@ class RouterstatsClient():
logging.info('Connected to %s', self.host) logging.info('Connected to %s', self.host)
self.login() self.login()
self.connected = True self.connected = True
self.received_lines = 0
except ConnectionRefusedError as error: except ConnectionRefusedError as error:
logging.error('Could not connect to %s:%s', self.host, self.port) logging.error('Could not connect to %s:%s', self.host, self.port)
raise ConnectionRefusedError from error raise ConnectionRefusedError from error
@@ -118,6 +120,9 @@ class RouterstatsClient():
#We're done for now, returning value #We're done for now, returning value
line = line.strip().decode('utf-8') line = line.strip().decode('utf-8')
logging.debug('Received from server: %s', line) logging.debug('Received from server: %s', line)
self.received_lines += 1
if not self.received_lines % 1000:
logging.info('Received %s lines', self.received_lines)
return line return line
else: else:
blanks += 1 blanks += 1

4
routerstats_collector.py
View File

@@ -282,6 +282,7 @@ class RequestHandler(socketserver.BaseRequestHandler):
def handle(self): def handle(self):
logging.info('Connected to %s', self.client_address[0]) logging.info('Connected to %s', self.client_address[0])
self.sendt_lines = 0
self.request.settimeout(5) self.request.settimeout(5)
start_time = datetime.now() start_time = datetime.now()
if not self.login(): if not self.login():
@@ -339,6 +340,9 @@ class RequestHandler(socketserver.BaseRequestHandler):
'''Wrap sendall''' '''Wrap sendall'''
logging.debug('Sending %s', tosend) logging.debug('Sending %s', tosend)
self.request.sendall(bytes(tosend + "\n", 'utf-8')) self.request.sendall(bytes(tosend + "\n", 'utf-8'))
self.sendt_lines += 1
if not self.sendt_lines % 1000:
logging.info('Sendt %s lines', self.sendt_lines)
def set_queue(self, input_queue, overflowqueue, signal_queue): def set_queue(self, input_queue, overflowqueue, signal_queue):
'''Set Queue for fetching events''' '''Set Queue for fetching events'''