diff --git a/docs/source/conf.py b/docs/source/conf.py index 0c8690e..efeb561 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -56,7 +56,7 @@ author = 'Thor77' # The short X.Y version. version = '0.4' # The full version, including alpha/beta/rc tags. -release = '0.4.0' +release = '0.4.1' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/setup.py b/setup.py index 3abc610..d4bfb5b 100644 --- a/setup.py +++ b/setup.py @@ -2,7 +2,7 @@ from setuptools import setup setup( name='tsstats', - version='0.4.0', + version='0.4.1', author='Thor77', author_email='thor77@thor77.org', description='A simple Teamspeak stats-generator', diff --git a/tsstats/log.py b/tsstats/log.py index 711ed3e..f9a7a87 100644 --- a/tsstats/log.py +++ b/tsstats/log.py @@ -15,12 +15,15 @@ logger = logging.getLogger('tsstats') def parse_logs(log_glob, ident_map=None): - for log_file in sorted(log_file for log_file in glob(log_glob)): - parse_log(log_file, ident_map) - - -def parse_log(log_path, ident_map=None): clients = Clients(ident_map) + for log_file in sorted(log_file for log_file in glob(log_glob)): + clients = parse_log(log_file, ident_map, clients) + return clients + + +def parse_log(log_path, ident_map=None, clients=None): + if not clients: + clients = Clients(ident_map) log_file = open(log_path) # process lines logger.debug('Started parsing of %s', log_file.name)