Akamaru/Mikubot-2
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Bugfix für handle_exception() und Crons

Browse Source
This commit is contained in:
Andreas Bielawski 2016-08-24 15:54:16 +02:00
parent fb9d3652f3
commit 49dd18ce3f
2 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
otouto/bot.lua
View File

@ -221,9 +221,9 @@ function bot:run(config)
for n=1, #self.plugins do
local v = self.plugins[n]
if v.cron then -- Call each plugin's cron function, if it has one.
local result, err = pcall(function() v.cron(config) end)
local result, err = pcall(function() v.cron(self, config) end)
if not result then
utilities.handle_exception(err, 'CRON: ' .. n, config.log_chat)
utilities.handle_exception(self, err, 'CRON: ' .. n, config.log_chat)
end
end
end

22
otouto/utilities.lua
View File

@ -499,14 +499,20 @@ function utilities:resolve_username(input)
end
function utilities:handle_exception(err, message, log_chat)
if not err then err = '' end
local output = '\n[' .. os.date('%F %T', os.time()) .. ']\n' .. self.info.username .. ': ' .. err .. '\n' .. message .. '\n'
if log_chat then
output = '<code>' .. utilities.html_escape(output) .. '</code>'
return utilities.send_message(log_chat, output, true, nil, 'html')
else
print(output)
end
local output = string.format(
'[%s]\n%s: %s\n%s\n',
os.date('%F %T'),
self.info.username,
err or '',
message
)
if log_chat then
output = '<code>' .. utilities.html_escape(output) .. '</code>'
return utilities.send_message(log_chat, output, true, nil, 'html')
else
print(output)
end
end
-- MOVED TO DOWNLOAD_TO_FILE