From 501aab3ff5a22c88806191f4ec264d9b652f2c0d Mon Sep 17 00:00:00 2001 From: Halali Date: Fri, 22 Mar 2019 17:41:19 +0100 Subject: [PATCH] Some logging improvements --- bazarr/main.py | 13 ++++++++++--- views/system.tpl | 33 +++++++++++++++++++++++++-------- 2 files changed, 35 insertions(+), 11 deletions(-) diff --git a/bazarr/main.py b/bazarr/main.py index 65173d434..365697a95 100644 --- a/bazarr/main.py +++ b/bazarr/main.py @@ -1683,16 +1683,23 @@ def system(): releases=releases, current_port=settings.general.port, throttled_providers=throttled_providers) -@route(base_url + 'logs/') +@route(base_url + 'logs//') @custom_auth_basic(check_credentials) -def get_logs(page): +def get_logs(level, page): authorize() page_size = int(settings.general.page_size) begin = (page * page_size) - page_size end = (page * page_size) - 1 logs_complete = [] for line in reversed(open(os.path.join(args.config_dir, 'log', 'bazarr.log')).readlines()): - logs_complete.append(line.rstrip()) + lin = [] + lin = line.split('|') + if 'ALL' in level or level is None: + logs_complete.append(line.rstrip()) + else: + if level in lin[1]: + logs_complete.append(line.rstrip()) + logs = logs_complete[begin:end] return template('logs', logs=logs, base_url=base_url, current_port=settings.general.port) diff --git a/views/system.tpl b/views/system.tpl index 415e25520..0177877b9 100644 --- a/views/system.tpl +++ b/views/system.tpl @@ -105,6 +105,16 @@ + + + +
@@ -324,9 +334,9 @@ $('.menu .item') .tab(); - function loadURL(page) { + function loadURL(level, page) { $.ajax({ - url: "{{base_url}}logs/" + page, + url: "{{base_url}}logs/" + level + "/" + page, beforeSend: function() { $('#loader').addClass('active'); }, complete: function() { $('#loader').removeClass('active'); }, cache: false @@ -335,6 +345,9 @@ }); current_page = page; + $('#level').on('change', function() { + current_level = $('#level option:checked').val(); + }); $("#page").text(current_page); if (current_page == 1) { @@ -349,23 +362,27 @@ } } - loadURL(1); + loadURL('ALL', 1); $('.backward').on('click', function(){ - loadURL(current_page - 1); + loadURL(current_level, current_page - 1); }); $('.fast.backward').on('click', function(){ - loadURL(1); + loadURL(current_level, 1); }); $('.forward').on('click', function(){ - loadURL(current_page + 1); + loadURL(current_level, current_page + 1); }); $('.fast.forward').on('click', function(){ - loadURL({{int(max_page)}}); + loadURL(current_level, {{int(max_page)}}); }); $('#refresh_log').on('click', function(){ - loadURL(current_page); + loadURL(current_level, current_page); + }); + + $('#level').on('change', function(){ + loadURL(current_level, current_page); }); $('#download_log').on('click', function(){