Merge pull request #2499 from dibdot/travelmate

luci-app-travelmate: small controller changes
This commit is contained in:
Dirk Brenken 2019-02-02 18:03:20 +01:00 committed by GitHub
commit ea2e4a2cf3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -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