Mirror/luci-app-internet-detector
1
0
Fork 0
mirror of https://github.com/gSpotx2f/luci-app-internet-detector.git synced 2025-12-06 03:26:50 +03:00
Code Issues Packages Projects Releases Wiki Activity

internet-detector-mod-email: minor improvements

Browse Source
This commit is contained in:
gSpot
2024-02-21 16:45:32 +03:00
parent 3f245bb410
commit 98d7b9d4f0
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
internet-detector-mod-email/files/usr/lib/lua/internet-detector/mod_email.lua
View File

@@ -27,6 +27,8 @@ local Module = {
mailSmtp = nil, mailSmtp = nil,
mailSmtpPort = nil, mailSmtpPort = nil,
mailSecurity = "tls", mailSecurity = "tls",
msgTextPattern1 = "[%s]: %s: %s", -- Connected (host, instance, message)
msgTextPattern2 = "[%s]: %s: %s", -- Disconnected (host, instance, message)
status = nil, status = nil,
_enabled = false, _enabled = false,
_deadCounter = 0, _deadCounter = 0,
@@ -85,8 +87,10 @@ function Module:init(t)
end end
end end
function Module:sendMessage(msg) function Module:sendMessage(msg, textPattern)
local verboseArg = "" local verboseArg = ""
local emailMsg = string.format(
textPattern, self.hostAlias, self.config.serviceConfig.instance, msg)
-- Debug -- Debug
if self.config.debug then if self.config.debug then
@@ -106,7 +110,7 @@ function Module:sendMessage(msg)
self.mtaConnectTimeout, self.mtaReadTimeout, self.mtaConnectTimeout, self.mtaReadTimeout,
self.mailUser, self.mailPassword, self.mailSender, self.mailRecipient, self.mailUser, self.mailPassword, self.mailSender, self.mailRecipient,
string.format("%s notification", self.hostAlias), string.format("%s notification", self.hostAlias),
string.format("[%s]: %s:\n%s", self.hostAlias, self.config.serviceConfig.instance, msg)) emailMsg)
-- Debug -- Debug
if self.config.debug then if self.config.debug then
@@ -143,7 +147,7 @@ function Module:run(currentStatus, lastStatus, timeDiff)
if not self._msgSentDisconnect and (self.mode == 1 or self.mode == 2) then if not self._msgSentDisconnect and (self.mode == 1 or self.mode == 2) then
if self._deadCounter >= self.deadPeriod then if self._deadCounter >= self.deadPeriod then
self._lastDisconnection = nil self._lastDisconnection = nil
self:sendMessage(table.concat(self._message, ", ")) self:sendMessage(table.concat(self._message, "; "), self.msgTextPattern2)
self._message = {} self._message = {}
self._msgSentDisconnect = true self._msgSentDisconnect = true
else else
@@ -157,11 +161,10 @@ function Module:run(currentStatus, lastStatus, timeDiff)
if not self._lastConnection then if not self._lastConnection then
self._lastConnection = os.date("%Y.%m.%d %H:%M:%S", os.time()) self._lastConnection = os.date("%Y.%m.%d %H:%M:%S", os.time())
end end
if self._aliveCounter >= self.alivePeriod then if self._aliveCounter >= self.alivePeriod then
self._message[#self._message + 1] = string.format( self._message[#self._message + 1] = string.format(
"Internet connected: %s", self._lastConnection) "Internet connected: %s", self._lastConnection)
self:sendMessage(table.concat(self._message, "; ")) self:sendMessage(table.concat(self._message, "; "), self.msgTextPattern1)
self._message = {} self._message = {}
self._msgSentConnect = true self._msgSentConnect = true
else else