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

Make you pass in logfile to follow, try to show when we send data from the overflowqueue. Fix a wording-wrong.

Browse Source
This commit is contained in:
Daniel Lysfjord
2024-04-16 00:26:05 +02:00
parent dfc5a4616d
commit 99a2a2ec47
1 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
routerstats_collector.py
View File

@@ -63,7 +63,7 @@ def filefetcher(filename: str, collector_queue, signal_queue, sleep_sec=0.5, see
if line.isspace(): if line.isspace():
logging.debug('Empty line is empty, thank you for the newline') logging.debug('Empty line is empty, thank you for the newline')
else: else:
logging.debug('Sending line ending at pos ' + str(input_file.tell())) logging.debug('Parsing line ending at pos ' + str(input_file.tell()))
parse_and_queue_line(line, collector_queue) parse_and_queue_line(line, collector_queue)
line = '' line = ''
start_stat = os.stat(filename) start_stat = os.stat(filename)
@@ -226,9 +226,11 @@ class RequestHandler(socketserver.BaseRequestHandler):
while True: while True:
try: try:
if self.overflowqueue.empty != True: if self.overflowqueue.empty != True:
tosend = self.overflowqueue.get_nowait() while True:
if tosend: tosend = self.overflowqueue.get_nowait()
self.send(tosend) if tosend:
logging.debug('Sending ' + str(tosend) + ' from overflowqueue')
self.send(tosend)
except queue.Empty: except queue.Empty:
pass pass
try: try:
@@ -237,8 +239,8 @@ class RequestHandler(socketserver.BaseRequestHandler):
tosend = str(event[0]) + ' ' + event[1] tosend = str(event[0]) + ' ' + event[1]
try: try:
self.send(tosend) self.send(tosend)
except BrokenPipeError: except (BrokenPipeError, ConnectionResetError) as error:
logging.error('Client gone') logging.error('Client gone: ' + str(error))
self.overflowqueue.put(tosend) self.overflowqueue.put(tosend)
break break
try: try:
@@ -247,6 +249,7 @@ class RequestHandler(socketserver.BaseRequestHandler):
logging.error('Client gone') logging.error('Client gone')
self.overflowqueue.put(tosend) self.overflowqueue.put(tosend)
break break
start_time = datetime.now()
except queue.Empty: except queue.Empty:
pass pass
@@ -362,7 +365,11 @@ def main():
'''Main thingy''' '''Main thingy'''
setproctitle('routerstats-collector main-thread') setproctitle('routerstats-collector main-thread')
logging.debug('Starting as PID ' + str(os.getpid())) logging.debug('Starting as PID ' + str(os.getpid()))
file_to_follow = 'syslogemu.log' try:
file_to_follow = sys.argv[1]
except IndexError:
logging.error('Need a log file to tail')
sys.exit()
#Just quit early if file is missing.. #Just quit early if file is missing..
if os.path.isfile(file_to_follow) is False: if os.path.isfile(file_to_follow) is False:
logging.error('Could not find file ' + file_to_follow) logging.error('Could not find file ' + file_to_follow)