# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1451680565 0
# Node ID cd63f764d1bfb2ea5b5c75e7d42fdfb1768f90e0
# Parent  a2a9dd606200ea5533315dd149af17b7cec42cff
main.lua: Restructure server log reading

diff -r a2a9dd606200 -r cd63f764d1bf main.lua
--- 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);