diff options
| -rw-r--r-- | client.lua | 2 | ||||
| -rw-r--r-- | save_file.lua | 8 | ||||
| -rw-r--r-- | server.lua | 2 | ||||
| -rwxr-xr-x | standalone_server.lua | 17 | ||||
| -rw-r--r-- | util.lua | 5 |
5 files changed, 24 insertions, 10 deletions
@@ -9,7 +9,7 @@ local client = {} local peer_info local function log(msg) - print("[client] " .. msg) + util.log("client", msg) end local function log_peer(clt, peer, msg) diff --git a/save_file.lua b/save_file.lua index 8dd85f2..f3559d4 100644 --- a/save_file.lua +++ b/save_file.lua @@ -1,5 +1,9 @@ local util = require("util") +local function log(msg) + util.log("savefile", msg) +end + local function save_file_write(filename, data) os.rename(filename, filename..".bak") local f = io.open(filename, "w") @@ -8,7 +12,7 @@ local function save_file_write(filename, data) end f:write(util.json_enc(data)) f:close() - print("[save_file] saved to " .. filename) + log("saved to " .. filename) return true end @@ -21,7 +25,7 @@ local function save_file_read(filename) if not data then return nil, "save_corrupted" end - print("[save_file] loaded " .. filename) + log("loaded " .. filename) else data = {} end @@ -11,7 +11,7 @@ local server = {} local peer_info local function log(msg) - print("[server] " .. msg) + util.log("server", msg) end local function log_peer(srv, peer, msg) diff --git a/standalone_server.lua b/standalone_server.lua index f399ad1..0ddb40f 100755 --- a/standalone_server.lua +++ b/standalone_server.lua @@ -1,14 +1,19 @@ #!/usr/bin/env lua5.1 local server = require("server") +local util = require("util") + +local function log(msg) + util.log("standalone_server", msg) +end local srv, err = server.create(assert(arg[1])) if err then if err == "save_corrupted" then - print("[standalone_server] savefile corrupted (try restoring backup?)") + log("savefile corrupted (try restoring backup?)") elseif err == "save_write_failed" then - print("[standalone_server] failed to open savefile for writing") + log("failed to open savefile for writing") else - print(err) + log(err) end os.exit(1) end @@ -20,11 +25,11 @@ local function server_loop() local status, invite = server.match_status(srv) if status == "fail" then - print("[standalone_server] failed to register match (match server down?)") + log("failed to register match (match server down?)") return false elseif status == "active" and not started then started = true - print("[standalone_server] invite: " .. invite) + log("invite: " .. invite) end end end @@ -37,7 +42,7 @@ local _, success = xpcall(server_loop, function(err) return false end, srv) -print("[standalone_server] shutting down") +log("shutting down") server.close(srv) if not success then @@ -86,6 +86,10 @@ local function display(x) return tostring(x) end +local function log(cat, msg) + print("["..cat.."] " .. msg) +end + return { rand_string = rand_string, mkdir = mkdir, @@ -96,4 +100,5 @@ return { send = send, split_addr = split_addr, display = display, + log = log, } |