summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorDirk Brenken <dev@brenken.org>2019-02-02 18:03:20 +0100
committerGitHub <noreply@github.com>2019-02-02 18:03:20 +0100
commitea2e4a2cf30f86ef871d3f76f02691f627bdf0b8 (patch)
tree65b1ac6a702059d2b055cc328c4ba8fd301a59bf
parente91e89b28afc05e575ee1f70d7a897ecb270bb58 (diff)
parent391ae75192448dd3941a7e1d71e88f33f74961f8 (diff)
Merge pull request #2499 from dibdot/travelmate
luci-app-travelmate: small controller changes
-rw-r--r--applications/luci-app-travelmate/luasrc/controller/travelmate.lua10
1 files changed, 2 insertions, 8 deletions
diff --git a/applications/luci-app-travelmate/luasrc/controller/travelmate.lua b/applications/luci-app-travelmate/luasrc/controller/travelmate.lua
index 0c5890810e..b201abf14d 100644
--- a/applications/luci-app-travelmate/luasrc/controller/travelmate.lua
+++ b/applications/luci-app-travelmate/luasrc/controller/travelmate.lua
@@ -1,4 +1,4 @@
--- Copyright 2017-2018 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.travelmate", package.seeall)
@@ -56,14 +56,8 @@ function status_update()
end
function logread()
- local content
+ local content = util.trim(util.exec("logread -e 'travelmate-'")) or ""
- if nixio.fs.access("/var/log/messages") then
- content = util.trim(util.exec("grep -F 'travelmate-' /var/log/messages"))
- else
- content = util.trim(util.exec("logread -e 'travelmate-'"))
- end
-
if content == "" then
content = "No travelmate related logs yet!"
end