Merge remote-tracking branch 'github/fix-admin-view-log-file'

This commit is contained in:
Ozzieisaacs 2020-01-27 18:14:16 +01:00
commit b29b5b7ac1

View File

@ -671,8 +671,12 @@ def view_logfile():
logfiles = {} logfiles = {}
logfiles[0] = logger.get_logfile(config.config_logfile) logfiles[0] = logger.get_logfile(config.config_logfile)
logfiles[1] = logger.get_accesslogfile(config.config_access_logfile) logfiles[1] = logger.get_accesslogfile(config.config_access_logfile)
return render_title_template("logviewer.html",title=_(u"Logfile viewer"), accesslog_enable=config.config_access_log, return render_title_template("logviewer.html",
logfiles=logfiles, page="logfile") title=_(u"Logfile viewer"),
accesslog_enable=config.config_access_log,
log_enable=bool(config.config_logfile != logger.LOG_TO_STDOUT),
logfiles=logfiles,
page="logfile")
@admi.route("/ajax/log/<int:logtype>") @admi.route("/ajax/log/<int:logtype>")