fix mismerge

5 years ago · fc79cdfaa2
parent 647e954e8a
commit fc79cdfaa2
1 changed files with 1 additions and 1 deletions
--- a/cps/admin.py
+++ b/cps/admin.py
@ -672,7 +672,7 @@ def view_logfile():
    logfiles[0] = logger.get_logfile(config.config_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,
-                                 log_enable=True, logfiles=logfiles, page="logfile")
+                                 log_enable=bool(config.config_logfile != logger.LOG_TO_STDOUT), logfiles=logfiles, page="logfile")


@admi.route("/ajax/log/<int:logtype>")