Claytonia/TeamspeakStats
Claytonia
/
TeamspeakStats
mirror of https://github.com/Thor77/TeamspeakStats.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Implement online_dc again

This commit is contained in:
Thor77 2017-08-23 20:57:40 +02:00
parent 90a367da27
commit 91a9b8e4c7
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
tsstats/log.py
View File

@ -1,5 +1,4 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
# TODO: Implemented online_dc again
import itertools import itertools
import logging import logging
import re import re
@ -125,17 +124,25 @@ def parse_logs(log_glob, ident_map=None, online_dc=True, *args, **kwargs):
''' '''
for virtualserver_id, logs in _bundle_logs(glob(log_glob)).items(): for virtualserver_id, logs in _bundle_logs(glob(log_glob)).items():
clients = Clients(ident_map) clients = Clients(ident_map)
for log in logs: for index, log in enumerate(logs):
with open(log.path, encoding='utf-8') as f: with open(log.path, encoding='utf-8') as f:
# parse logfile line by line and filter lines without events # parse logfile line by line and filter lines without events
events = filter(None, map(_parse_line, f)) events = filter(None, map(_parse_line, f))
# chain apply events to Client-obj # chain apply events to Client-obj
clients.apply_events(itertools.chain.from_iterable(events)) clients.apply_events(itertools.chain.from_iterable(events))
# warn for online clients
# find connected clients
online_clients = list(filter(lambda c: c.connected, clients)) online_clients = list(filter(lambda c: c.connected, clients))
logger.debug( logger.debug(
'Some clients are still connected: %s' % online_clients 'Some clients are still connected: %s', online_clients
) )
if index == len(logs) - 1 and online_dc:
logger.debug('Last log => disconnecting online clients')
# last iteration => disconnect online clients if desired
for online_client in online_clients:
online_client.disconnect(pendulum.utcnow())
online_client.connected += 1
if len(clients) >= 1: if len(clients) >= 1:
# assemble Server-obj and yield # assemble Server-obj and yield
yield Server(virtualserver_id, clients) yield Server(virtualserver_id, clients)