diff options
Diffstat (limited to 'src/server')
| -rw-r--r-- | src/server/ConsoleInput.hx | 5 | ||||
| -rw-r--r-- | src/server/Logger.hx | 14 | ||||
| -rw-r--r-- | src/server/Main.hx | 2 | ||||
| -rw-r--r-- | src/server/ServerEvent.hx | 2 |
4 files changed, 18 insertions, 5 deletions
diff --git a/src/server/ConsoleInput.hx b/src/server/ConsoleInput.hx index 119d87e..4ae729c 100644 --- a/src/server/ConsoleInput.hx +++ b/src/server/ConsoleInput.hx @@ -135,8 +135,9 @@ class ConsoleInput { case LogList: Utils.ensureDir(main.logsDir); - final names = FileSystem.readDirectory(main.logsDir) - .filter(s -> s.endsWith(".json")); + final names = FileSystem.readDirectory(main.logsDir).filter(s -> { + return s.endsWith(".json"); + }); for (name in names) { trace(Path.withoutExtension(name)); } diff --git a/src/server/Logger.hx b/src/server/Logger.hx index f089c94..c1d82d8 100644 --- a/src/server/Logger.hx +++ b/src/server/Logger.hx @@ -1,5 +1,6 @@ package server; +import Types.WsEventType; import haxe.Json; import haxe.io.Path; import sys.FileSystem; @@ -24,6 +25,17 @@ class Logger { public function log(event:ServerEvent):Void { logs.push(event); if (logs.length > 1000) logs.shift(); + if (hasSameLatestEvents(GetTime, 5)) { + logs.splice(logs.length - 3, 1); + } + } + + function hasSameLatestEvents(type:WsEventType, count:Int):Bool { + if (logs.length < count) return false; + for (i in 1...count + 1) { + if (logs[logs.length - i].event.type != type) return false; + } + return true; } public function saveLog():Void { @@ -31,7 +43,7 @@ class Logger { Utils.ensureDir(folder); removeOldestLog(folder); final name = DateTools.format(Date.now(), "%Y-%m-%d_%H_%M_%S"); - File.saveContent('$folder/$name.json', Json.stringify(logs, filterNulls, "\t")); + File.saveContent('$folder/$name.json', Json.stringify(getLogs(), filterNulls, "\t")); } public function getLogs():Array<ServerEvent> { diff --git a/src/server/Main.hx b/src/server/Main.hx index 3ab0621..7a1b06a 100644 --- a/src/server/Main.hx +++ b/src/server/Main.hx @@ -405,7 +405,7 @@ class Main { clientName: client.name, clientGroup: client.group.toInt(), event: data, - time: Date.now().getTime() + time: Date.now().toString() }); switch (data.type) { case Connected: diff --git a/src/server/ServerEvent.hx b/src/server/ServerEvent.hx index 6b9080f..1817028 100644 --- a/src/server/ServerEvent.hx +++ b/src/server/ServerEvent.hx @@ -3,7 +3,7 @@ package server; import Types.WsEvent; typedef ServerEvent = { - time:Float, + time:String, clientName:String, clientGroup:Int, event:WsEvent |