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

parse_logs: Return Server instead of dict 

because it's easier to iterate and access contained information
This commit is contained in:
Thor77 2016-11-19 22:25:57 +01:00
parent 6003543309
commit fdbde18856
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tsstats/log.py
View File

@ -24,6 +24,7 @@ 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']) TimedLog = namedtuple('TimedLog', ['path', 'timestamp'])
Server = namedtuple('Server', ['sid', 'clients'])
logger = logging.getLogger('tsstats') logger = logging.getLogger('tsstats')
@ -40,9 +41,9 @@ def parse_logs(log_glob, ident_map=None, online_dc=True, *args, **kwargs):
:type ident_map: dict :type ident_map: dict
:return: clients bundled by virtual-server :return: clients bundled by virtual-server
:rtype: dict :rtype: tsstats.log.Server
''' '''
vserver_clients = {} server = []
for virtualserver_id, logs in\ for virtualserver_id, logs in\
_bundle_logs(glob(log_glob)).items(): _bundle_logs(glob(log_glob)).items():
clients = Clients(ident_map) clients = Clients(ident_map)
@ -56,8 +57,8 @@ def parse_logs(log_glob, ident_map=None, online_dc=True, *args, **kwargs):
_parse_details(logs[-1].path, clients=clients, online_dc=online_dc, _parse_details(logs[-1].path, clients=clients, online_dc=online_dc,
*args, **kwargs) *args, **kwargs)
if len(clients) >= 1: if len(clients) >= 1:
vserver_clients[virtualserver_id] = clients server.append(Server(virtualserver_id, clients))
return vserver_clients return server
def _bundle_logs(logs): def _bundle_logs(logs):