Merge pull request #92 from donglei/fixed-gc

Logger improved for GC using
huntlabs · Oct 21, 2021 · 7dae022 · 7dae022
2 parents 6e830ec + 2aadd1f
commit 7dae022
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 16 deletions.
diff --git a/source/hunt/logging/ConsoleLogger.d b/source/hunt/logging/ConsoleLogger.d
@@ -30,7 +30,7 @@ import std.typecons;
 import std.traits;
 
 alias LogLayoutHandler = string delegate(string time_prior, string tid, string level, string myFunc, 
-				string msg, string file, size_t line);
+                string msg, string file, size_t line);
 
 private {
     __gshared LogLayoutHandler _layoutHandler;
@@ -40,8 +40,10 @@ private {
             _layoutHandler = (string time_prior, string tid, string level, string fun, 
                     string msg, string file, size_t line) {
 
-                return time_prior ~ " | " ~ tid ~ " | " ~ level ~ " | " ~ fun ~ " | " ~ msg
-                ~ " | " ~ file ~ ":" ~ to!string(line);
+                import std.format;
+                return format("%s | %s | %s | %s | %s | %s:%d", time_prior, tid, level, fun, msg, file, line);
+               /* return time_prior ~ " | " ~ tid ~ " | " ~ level ~ " | " ~ fun ~ " | " ~ msg
+                ~ " | " ~ file ~ ":" ~ to!string(line);*/
             };
         }
 
@@ -234,7 +236,7 @@ class ConsoleLogger {
 
     private static string layout(string file = __FILE__, size_t line = __LINE__,
             string func = __FUNCTION__)(string msg, string level) {
-        enum lineNum = std.conv.to!string(line);
+        //enum lineNum = std.conv.to!string(line);
         string time_prior = Clock.currTime.toString();
         string tid = std.conv.to!string(cast(size_t)getTid());
 
@@ -250,12 +252,14 @@ class ConsoleLogger {
             fun = func[index + 1 .. $];
         }
 
-		LogLayoutHandler handler = layoutHandler();
-		if(handler !is null) {
-			return handler(time_prior, tid, level, fun, msg, file, line);
-		} else {
-            return time_prior ~ " | " ~ tid ~ " | " ~ level ~ " | " ~ fun ~ " | " ~ msg
-                ~ " | " ~ file ~ ":" ~ lineNum;
+        LogLayoutHandler handler = layoutHandler();
+        if(handler !is null) {
+            return handler(time_prior, tid, level, fun, msg, file, line);
+        } else {
+            import std.format;
+            return format("%s | %s | %s | %s | %s | %s:%d", time_prior, tid, level, fun, msg, file, line);
+           /* return time_prior ~ " | " ~ tid ~ " | " ~ level ~ " | " ~ fun ~ " | " ~ msg
+                ~ " | " ~ file ~ ":" ~ lineNum;*/
         }
     }
 
@@ -383,7 +387,7 @@ class ConsoleLogger {
 
 
 void setLogLayout(LogLayoutHandler handler) {
-	_layoutHandler = handler;
+    _layoutHandler = handler;
 }
 
 

diff --git a/source/hunt/logging/Logger.d b/source/hunt/logging/Logger.d
@@ -44,9 +44,10 @@ LogLayoutHandler layoutHandler() {
 	if(_layoutHandler is null) {
 		_layoutHandler = (string time_prior, string tid, string level, string myFunc, 
 				string msg, string file, size_t line) {
-
-			return time_prior ~ " (" ~ tid ~ ") [" ~ level ~ "] " ~ myFunc ~ 
-				" - " ~ msg ~ " - " ~ file ~ ":" ~ to!string(line);
+			import std.format;
+			return format("%s (%s) [%s] %s - %s - %s:%d", time_prior, tid, level, myFunc, msg, file, line);
+			//return time_prior ~ " (" ~ tid ~ ") [" ~ level ~ "] " ~ myFunc ~
+			//	" - " ~ msg ~ " - " ~ file ~ ":" ~ to!string(line);
 		};
 	}
 
@@ -591,8 +592,10 @@ protected:
 		if(handler !is null) {
 			return handler(time_prior, tid, toString(level), myFunc, msg, file, line);
 		} else {
-			return time_prior ~ " (" ~ tid ~ ") [" ~ toString(
-					level) ~ "] " ~ myFunc ~ " - " ~ msg ~ " - " ~ file ~ ":" ~ to!string(line);
+			/*return time_prior ~ " (" ~ tid ~ ") [" ~ toString(
+					level) ~ "] " ~ myFunc ~ " - " ~ msg ~ " - " ~ file ~ ":" ~ to!string(line);*/
+			import std.format;
+			return format("%s | %s | %s | %s | %s | %s:%d", time_prior, tid, level, myFunc, msg, file, line);
 		}
 	}