Claytonia/TeamspeakStats
Claytonia/TeamspeakStats
1
0
Fork 0
mirror of https://github.com/Thor77/TeamspeakStats.git synced 2025-11-03 23:32:45 -05:00
Code Issues Projects Releases Packages Wiki Activity

add filename-checking to split logs by sid

Browse source 
* if filename doesn't match, fallback to plain sorting
* using re_log_filename to match
This commit is contained in:
Thor77 2016-06-19 22:10:35 +02:00
parent bec0279871
commit ad7ff96b1b
1 changed files with 30 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
tsstats/log.py
View file

@ -2,11 +2,15 @@
import logging import logging
import re import re
from collections import namedtuple
from datetime import datetime from datetime import datetime
from glob import glob from glob import glob
from os.path import basename
from tsstats.client import Client, Clients from tsstats.client import Client, Clients
re_log_filename = re.compile(r'ts3server_(?P<date>\d{4}-\d\d-\d\d)'
'__(?P<time>\d\d_\d\d_\d\d.\d+)_(?P<sid>\d).log')
re_log_entry = re.compile('(?P<timestamp>\d{4}-\d\d-\d\d\ \d\d:\d\d:\d\d.\d+)' re_log_entry = re.compile('(?P<timestamp>\d{4}-\d\d-\d\d\ \d\d:\d\d:\d\d.\d+)'
'\|\ *(?P<level>\w+)\ *\|\ *(?P<component>\w+)\ *' '\|\ *(?P<level>\w+)\ *\|\ *(?P<component>\w+)\ *'
'\|\ *(?P<sid>\d+)\ *\|\ *(?P<message>.*)') '\|\ *(?P<sid>\d+)\ *\|\ *(?P<message>.*)')
@ -17,6 +21,8 @@ re_disconnect_invoker = re.compile(
log_timestamp_format = '%Y-%m-%d %H:%M:%S.%f' log_timestamp_format = '%Y-%m-%d %H:%M:%S.%f'
TimedLog = namedtuple('TimedLog', ['path', 'timestamp'])
logger = logging.getLogger('tsstats') logger = logging.getLogger('tsstats')
@ -26,6 +32,7 @@ def parse_logs(log_glob, ident_map=None, *args, **kwargs):
parse logs specified by globbing pattern `log_glob` parse logs specified by globbing pattern `log_glob`
basic parsing is done here: extracting sid and splitting basic parsing is done here: extracting sid and splitting
and then given to _parse_details
:param log_glob: path to log-files (supports globbing) :param log_glob: path to log-files (supports globbing)
:param ident_map: :doc:`identmap` :param ident_map: :doc:`identmap`
@ -36,10 +43,30 @@ def parse_logs(log_glob, ident_map=None, *args, **kwargs):
:return: parsed clients :return: parsed clients
:rtype: tsstats.client.Clients :rtype: tsstats.client.Clients
''' '''
clients = Clients(ident_map) vserver_logfiles = {} # sid: [/path/to/log1, ..., /path/to/logn]
for log_file in sorted(log_file for log_file in glob(log_glob)): for log_file in sorted(log_file for log_file in glob(log_glob)):
clients = parse_log(log_file, ident_map, clients, *args, **kwargs) # try to get date and sid from filename
return clients match = re_log_filename.match(basename(log_file))
if match:
match = match.groupdict()
timestamp = datetime.strptime('{0} {1}'.format(
match['date'], match['time'].replace('_', ':')))
tl = TimedLog(log_file, timestamp)
sid = match['sid']
if sid in vserver_logfiles:
# if already exists, keep list sorted by timestamp
vserver_logfiles[sid].apppend(tl)
vserver_logfiles[sid] =\
sorted(vserver_logfiles[sid],
key=lambda tl: tl.timestamp)
else:
# if not exists, just create a list
vserver_logfiles[match['sid']] = [tl]
else:
# fallback to plain sorting
vserver_logfiles.setdefault('', [])\
.append(TimedLog(log_file, None))
return vserver_logfiles
def _parse_details(log_path, ident_map=None, clients=None, online_dc=True): def _parse_details(log_path, ident_map=None, clients=None, online_dc=True):