summaryrefslogtreecommitdiffhomepage
path: root/applications
diff options
context:
space:
mode:
authorDirk Brenken <dev@brenken.org>2019-02-02 09:04:33 +0100
committerDirk Brenken <dev@brenken.org>2019-02-02 09:04:33 +0100
commitc6e3d054358d78496a34c5adc236cdc6750c00e5 (patch)
tree868c716965d201ab1f2a76f0c852ed9b43afbf5d /applications
parent68d3351d36752cd111ea7059505fc9dfc71d32fb (diff)
luci-app-DNSCrypt-Proxy: small controller changes
- remove needless Turris Omnia logread workaround, due to changes in latest syslog-ng package Signed-off-by: Dirk Brenken <dev@brenken.org>
Diffstat (limited to 'applications')
-rw-r--r--applications/luci-app-dnscrypt-proxy/luasrc/controller/dnscrypt-proxy.lua12
1 files changed, 5 insertions, 7 deletions
diff --git a/applications/luci-app-dnscrypt-proxy/luasrc/controller/dnscrypt-proxy.lua b/applications/luci-app-dnscrypt-proxy/luasrc/controller/dnscrypt-proxy.lua
index ca078f0cd..c05594525 100644
--- a/applications/luci-app-dnscrypt-proxy/luasrc/controller/dnscrypt-proxy.lua
+++ b/applications/luci-app-dnscrypt-proxy/luasrc/controller/dnscrypt-proxy.lua
@@ -1,4 +1,4 @@
--- Copyright 2017 Dirk Brenken (dev@brenken.org)
+-- Copyright 2017-2019 Dirk Brenken (dev@brenken.org)
-- This is free software, licensed under the Apache License, Version 2.0
module("luci.controller.dnscrypt-proxy", package.seeall)
@@ -27,12 +27,10 @@ function view_reslist()
end
function logread()
- local logfile
-
- if nixio.fs.access("/var/log/messages") then
- logfile = util.trim(util.exec("cat /var/log/messages | grep 'dnscrypt-proxy'"))
- else
- logfile = util.trim(util.exec("logread -e 'dnscrypt-proxy'"))
+ local logfile = util.trim(util.exec("logread -e 'dnscrypt-proxy' 2>/dev/null")) or ""
+
+ if logfile == "" then
+ logfile = "No DNSCrypt-Proxy related logs yet!"
end
templ.render("dnscrypt-proxy/logread", {title = i18n.translate("DNSCrypt-Proxy Logfile"), content = logfile})
end