changeset
main.lua: Restructure server log reading
Fri, 01 Jan 2016 20:36:05 +0000
- author
- Matthew Wild <mwild1@gmail.com>
- date
- Fri, 01 Jan 2016 20:36:05 +0000
- changeset 68
- cd63f764d1bf
- parent 67
- a2a9dd606200
- child 69
- 1de0ebd8832f
main.lua: Restructure server log reading
| main.lua | file | annotate | diff | comparison | revisions |
--- a/main.lua Fri Jan 01 20:34:51 2016 +0000 +++ b/main.lua Fri Jan 01 20:36:05 2016 +0000 @@ -121,6 +121,9 @@ local handler = object.handler; assert(handler[action.action], "Objects of type '"..object.type.."' do not support action '"..action.action.."'"); print(""); + if server_log_reader then + log_data("server", { lines = server_log_reader() }); + end log_data("action", { action = action.action; object = object.name; @@ -131,11 +134,11 @@ if action.annotation then print(action.annotation); end + print(object.name, action.action.."..."); + local ok, err = pcall(handler[action.action], object, action.extra); if server_log_reader then log_data("server", { lines = server_log_reader() }); end - print(object.name, action.action.."..."); - local ok, err = pcall(handler[action.action], object, action.extra); if not ok then log_data("error", { message = err }); error(err);
