From 59058c1b9277707b0a74c8870b05c5107b13caf5 Mon Sep 17 00:00:00 2001 From: shmyga Date: Wed, 20 Dec 2017 17:01:12 +0300 Subject: [PATCH] [log] fix format --- haxelib.json | 2 +- src/main/haxework/log/JSLogger.hx | 4 ++-- src/main/haxework/log/SocketLogger.hx | 16 ++++++++++++---- 3 files changed, 15 insertions(+), 7 deletions(-) diff --git a/haxelib.json b/haxelib.json index 83bed58..5029c34 100755 --- a/haxelib.json +++ b/haxelib.json @@ -4,7 +4,7 @@ "license": "BSD", "tags": ["flash"], "description": "Framework.", - "version": "0.6.0", + "version": "0.6.1", "releasenote": "Update.", "contributors": ["shmyga"], "classPath": "src/main", diff --git a/src/main/haxework/log/JSLogger.hx b/src/main/haxework/log/JSLogger.hx index d44724d..1694327 100755 --- a/src/main/haxework/log/JSLogger.hx +++ b/src/main/haxework/log/JSLogger.hx @@ -16,14 +16,14 @@ class JSLogger extends BaseLogger { override public function e(tag:String, message:String, error:Dynamic = null, p:haxe.PosInfos = null):Void { if (available) { var text:String = buildString(LogLevel.ERROR, tag, message, error); - var s:String = p.fileName + ":" + p.lineNumber + ":" + text + "\n"; + var s:String = p.fileName + ":" + p.lineNumber + ": " + text + "\n"; try {ExternalInterface.call("console.error", s);} catch (error:Dynamic) {available = false;} } } override private function write(text:String, ?p:haxe.PosInfos):Void { if (available) { - var s:String = p.fileName + ":" + p.lineNumber + ":" + text + "\n"; + var s:String = p.fileName + ":" + p.lineNumber + ": " + text + "\n"; try {ExternalInterface.call("console.log", s);} catch (error:Dynamic) {available = false;} } } diff --git a/src/main/haxework/log/SocketLogger.hx b/src/main/haxework/log/SocketLogger.hx index daac943..7e7919a 100755 --- a/src/main/haxework/log/SocketLogger.hx +++ b/src/main/haxework/log/SocketLogger.hx @@ -24,20 +24,28 @@ class SocketLogger extends BaseLogger { socket = new Socket(); #if flash socket.addEventListener(IOErrorEvent.IO_ERROR, function(error):Void { - //L.e("SocketLogger", "", error); + onError(error); }); socket.addEventListener(SecurityErrorEvent.SECURITY_ERROR, function(error):Void { - //L.e("SocketLogger", "", error); + onError(error); }); socket.connect(CompilationOption.get("debug.address"), Std.parseInt(CompilationOption.get("debug.port"))); #else - socket.connect(new Host(CompilationOption.get("debug.address")), Std.parseInt(CompilationOption.get("debug.port"))); + try { + socket.connect(new Host(CompilationOption.get("debug.address")), Std.parseInt(CompilationOption.get("debug.port"))); + } catch (error: Dynamic) { + onError(error); + } #end } + private function onError(error:Dynamic):Void { + //trace("SocketLogger", "", error); + } + override private function write(text:String, ?p:haxe.PosInfos):Void { try { - var s:String = p.fileName + ":" + p.lineNumber + ":" + text + "\n"; + var s:String = p.fileName + ":" + p.lineNumber + ": " + text + "\n"; #if flash socket.writeUTF(s); socket.flush();