initializeConsoleLogger

malytomas · malytomas · commit 94826672617d · 2024-10-08T21:04:38.000+02:00
diff --git a/sources/asset-database/main.cpp b/sources/asset-database/main.cpp
@@ -9,18 +9,14 @@ void configParseCmd(int argc, const char *args[]);
 void start();
 void listen();
 
-bool consoleLogFilter(const cage::detail::LoggerInfo &info)
+bool logFilter(const cage::detail::LoggerInfo &info)
 {
 	return info.severity >= SeverityEnum::Error || String(info.component) == "exception" || String(info.component) == "asset" || String(info.component) == "verdict" || String(info.component) == "help";
 }
 
 int main(int argc, const char *args[])
 {
-	Holder<Logger> conLog = newLogger();
-	conLog->filter.bind<&consoleLogFilter>();
-	conLog->format.bind<&logFormatConsole>();
-	conLog->output.bind<&logOutputStdOut>();
-
+	initializeConsoleLogger()->filter.bind<logFilter>();
 	try
 	{
 		configParseCmd(argc, args);
diff --git a/sources/image-channels/main.cpp b/sources/image-channels/main.cpp
@@ -84,10 +84,7 @@ void doJoin(const String names[MaxChannels], const String &output, const bool mo
 
 int main(int argc, const char *args[])
 {
-	Holder<Logger> log = newLogger();
-	log->format.bind<logFormatConsole>();
-	log->output.bind<logOutputStdOut>();
-
+	initializeConsoleLogger();
 	try
 	{
 		Holder<Ini> cmd = newIni();
diff --git a/sources/image-convert/main.cpp b/sources/image-convert/main.cpp
@@ -29,10 +29,7 @@ void convert(String src, const String &format, bool preserveOriginal)
 
 int main(int argc, const char *args[])
 {
-	Holder<Logger> log = newLogger();
-	log->format.bind<logFormatConsole>();
-	log->output.bind<logOutputStdOut>();
-
+	initializeConsoleLogger();
 	try
 	{
 		Holder<Ini> cmd = newIni();
diff --git a/sources/image-info/main.cpp b/sources/image-info/main.cpp
@@ -26,10 +26,7 @@ void info(const String &src)
 
 int main(int argc, const char *args[])
 {
-	Holder<Logger> log = newLogger();
-	log->format.bind<logFormatConsole>();
-	log->output.bind<logOutputStdOut>();
-
+	initializeConsoleLogger();
 	try
 	{
 		Holder<Ini> cmd = newIni();
diff --git a/sources/image-resize/main.cpp b/sources/image-resize/main.cpp
@@ -21,10 +21,7 @@ void resize(String name, const Vec2i resolution)
 
 int main(int argc, const char *args[])
 {
-	Holder<Logger> log = newLogger();
-	log->format.bind<logFormatConsole>();
-	log->output.bind<logOutputStdOut>();
-
+	initializeConsoleLogger();
 	try
 	{
 		Holder<Ini> cmd = newIni();
diff --git a/sources/image-untile/main.cpp b/sources/image-untile/main.cpp
@@ -76,10 +76,7 @@ void untile(const String &input, const String &output, uint32 x, uint32 y, uint3
 
 int main(int argc, const char *args[])
 {
-	Holder<Logger> log = newLogger();
-	log->format.bind<logFormatConsole>();
-	log->output.bind<logOutputStdOut>();
-
+	initializeConsoleLogger();
 	try
 	{
 		Holder<Ini> cmd = newIni();
diff --git a/sources/include/cage-core/logger.h b/sources/include/cage-core/logger.h
@@ -57,6 +57,8 @@ namespace cage
 	}
 
 	CAGE_CORE_API StringPointer severityToString(const SeverityEnum severity);
+
+	CAGE_CORE_API Logger *initializeConsoleLogger();
 }
 
 #endif // guard_logger_h_0d9702a6_c7ca_4260_baff_7fc1b3c1dec5_
diff --git a/sources/libcore/logger.cpp b/sources/libcore/logger.cpp
@@ -60,7 +60,7 @@ namespace cage
 					loggerLast()->next = this;
 				}
 				loggerLast() = this;
-				output.bind<&logOutputStdErr>();
+				output.bind<logOutputStdErr>();
 			}
 
 			~LoggerImpl()
@@ -98,12 +98,12 @@ namespace cage
 					if (detail::isDebugging())
 					{
 						loggerDebug = newLogger();
-						loggerDebug->format.bind<&logFormatConsole>();
-						loggerDebug->output.bind<&logOutputDebug>();
+						loggerDebug->format.bind<logFormatConsole>();
+						loggerDebug->output.bind<logOutputDebug>();
 					}
 
 					loggerFile = newLogger();
-					loggerFile->format.bind<&logFormatFileShort>();
+					loggerFile->format.bind<logFormatFileShort>();
 
 					try
 					{
@@ -456,5 +456,22 @@ namespace cage
 				CAGE_LOG(SeverityEnum::Info, "log", Stringizer() + "total duration: " + duration + " days, " + hours + " hours, " + mins + " minutes, " + secs + " seconds and " + micros + " microseconds");
 			}
 		} initialLogInstance;
+
+		struct ConsoleLogger : private Immovable
+		{
+			Holder<Logger> conLog = newLogger();
+
+			ConsoleLogger()
+			{
+				conLog->format.bind<logFormatConsole>();
+				conLog->output.bind<logOutputStdOut>();
+			}
+		};
+	}
+
+	Logger *initializeConsoleLogger()
+	{
+		static ConsoleLogger *inst = new ConsoleLogger(); // intentional leak
+		return +inst->conLog;
 	}
 }
diff --git a/sources/mesh-info/main.cpp b/sources/mesh-info/main.cpp
@@ -105,11 +105,7 @@ bool logFilter(const detail::LoggerInfo &i)
 
 int main(int argc, const char *args[])
 {
-	Holder<Logger> log = newLogger();
-	log->filter.bind<logFilter>();
-	log->format.bind<logFormatConsole>();
-	log->output.bind<logOutputStdOut>();
-
+	initializeConsoleLogger()->filter.bind<logFilter>();
 	try
 	{
 		Holder<Ini> cmd = newIni();
diff --git a/sources/test-assets/main.cpp b/sources/test-assets/main.cpp
@@ -7,10 +7,7 @@ using namespace cage;
 
 int main(int argc, const char *args[])
 {
-	Holder<Logger> log = newLogger();
-	log->format.bind<logFormatConsole>();
-	log->output.bind<logOutputStdOut>();
-
+	initializeConsoleLogger();
 	try
 	{
 		while (true)
diff --git a/sources/test-core/main.cpp b/sources/test-core/main.cpp
@@ -78,9 +78,7 @@ void generatePointsOnSphere();
 
 int main()
 {
-	Holder<Logger> log1 = newLogger();
-	log1->format.bind<logFormatConsole>();
-	log1->output.bind<logOutputStdOut>();
+	initializeConsoleLogger();
 
 	//generatePointsOnSphere();
 	testMacros();
diff --git a/sources/test-entities/main.cpp b/sources/test-entities/main.cpp
@@ -507,10 +507,7 @@ void performanceLoop()
 
 int main(int argc, const char *args[])
 {
-	Holder<Logger> log = newLogger();
-	log->format.bind<logFormatConsole>();
-	log->output.bind<logOutputStdOut>();
-
+	initializeConsoleLogger();
 	try
 	{
 		performanceLoop();
diff --git a/sources/test-ginnel/main.cpp b/sources/test-ginnel/main.cpp
@@ -73,10 +73,7 @@ namespace
 
 int main(int argc, const char *args[])
 {
-	Holder<Logger> log = newLogger();
-	log->format.bind<logFormatConsole>();
-	log->output.bind<logOutputStdOut>();
-
+	initializeConsoleLogger();
 	try
 	{
 		if (argc == 1)
diff --git a/sources/test-install/main.cpp b/sources/test-install/main.cpp
@@ -6,9 +6,7 @@ void testCageInstallConsistentPaths();
 
 int main(int argc, const char *args[])
 {
-	Holder<Logger> log = newLogger();
-	log->format.bind<logFormatConsole>();
-	log->output.bind<logOutputStdOut>();
+	initializeConsoleLogger();
 	testCageInstallConsistentPaths();
 	return 0;
 }

Original file line number	Diff line number	Diff line change
`@@ -9,18 +9,14 @@ void configParseCmd(int argc, const char *args[]);`
`9`	`9`	`void start();`
`10`	`10`	`void listen();`
`11`	`11`
`12`		`-bool consoleLogFilter(const cage::detail::LoggerInfo &info)`
	`12`	`+bool logFilter(const cage::detail::LoggerInfo &info)`
`13`	`13`	`{`
`14`	`14`	`return info.severity >= SeverityEnum::Error \|\| String(info.component) == "exception" \|\| String(info.component) == "asset" \|\| String(info.component) == "verdict" \|\| String(info.component) == "help";`
`15`	`15`	`}`
`16`	`16`
`17`	`17`	`int main(int argc, const char *args[])`
`18`	`18`	`{`
`19`		`- Holder<Logger> conLog = newLogger();`
`20`		`- conLog->filter.bind<&consoleLogFilter>();`
`21`		`- conLog->format.bind<&logFormatConsole>();`
`22`		`- conLog->output.bind<&logOutputStdOut>();`
`23`		`-`
	`19`	`+ initializeConsoleLogger()->filter.bind<logFilter>();`
`24`	`20`	`try`
`25`	`21`	`{`
`26`	`22`	`configParseCmd(argc, args);`
Original file line number	Diff line number	Diff line change
`@@ -84,10 +84,7 @@ void doJoin(const String names[MaxChannels], const String &output, const bool mo`
`84`	`84`
`85`	`85`	`int main(int argc, const char *args[])`
`86`	`86`	`{`
`87`		`- Holder<Logger> log = newLogger();`
`88`		`- log->format.bind<logFormatConsole>();`
`89`		`- log->output.bind<logOutputStdOut>();`
`90`		`-`
	`87`	`+ initializeConsoleLogger();`
`91`	`88`	`try`
`92`	`89`	`{`
`93`	`90`	`Holder<Ini> cmd = newIni();`
Original file line number	Diff line number	Diff line change
`@@ -29,10 +29,7 @@ void convert(String src, const String &format, bool preserveOriginal)`
`29`	`29`
`30`	`30`	`int main(int argc, const char *args[])`
`31`	`31`	`{`
`32`		`- Holder<Logger> log = newLogger();`
`33`		`- log->format.bind<logFormatConsole>();`
`34`		`- log->output.bind<logOutputStdOut>();`
`35`		`-`
	`32`	`+ initializeConsoleLogger();`
`36`	`33`	`try`
`37`	`34`	`{`
`38`	`35`	`Holder<Ini> cmd = newIni();`
Original file line number	Diff line number	Diff line change
`@@ -26,10 +26,7 @@ void info(const String &src)`
`26`	`26`
`27`	`27`	`int main(int argc, const char *args[])`
`28`	`28`	`{`
`29`		`- Holder<Logger> log = newLogger();`
`30`		`- log->format.bind<logFormatConsole>();`
`31`		`- log->output.bind<logOutputStdOut>();`
`32`		`-`
	`29`	`+ initializeConsoleLogger();`
`33`	`30`	`try`
`34`	`31`	`{`
`35`	`32`	`Holder<Ini> cmd = newIni();`
Original file line number	Diff line number	Diff line change
`@@ -21,10 +21,7 @@ void resize(String name, const Vec2i resolution)`
`21`	`21`
`22`	`22`	`int main(int argc, const char *args[])`
`23`	`23`	`{`
`24`		`- Holder<Logger> log = newLogger();`
`25`		`- log->format.bind<logFormatConsole>();`
`26`		`- log->output.bind<logOutputStdOut>();`
`27`		`-`
	`24`	`+ initializeConsoleLogger();`
`28`	`25`	`try`
`29`	`26`	`{`
`30`	`27`	`Holder<Ini> cmd = newIni();`
Original file line number	Diff line number	Diff line change
`@@ -76,10 +76,7 @@ void untile(const String &input, const String &output, uint32 x, uint32 y, uint3`
`76`	`76`
`77`	`77`	`int main(int argc, const char *args[])`
`78`	`78`	`{`
`79`		`- Holder<Logger> log = newLogger();`
`80`		`- log->format.bind<logFormatConsole>();`
`81`		`- log->output.bind<logOutputStdOut>();`
`82`		`-`
	`79`	`+ initializeConsoleLogger();`
`83`	`80`	`try`
`84`	`81`	`{`
`85`	`82`	`Holder<Ini> cmd = newIni();`
Original file line number	Diff line number	Diff line change
`@@ -57,6 +57,8 @@ namespace cage`
`57`	`57`	`}`
`58`	`58`
`59`	`59`	`CAGE_CORE_API StringPointer severityToString(const SeverityEnum severity);`
	`60`	`+`
	`61`	`+ CAGE_CORE_API Logger *initializeConsoleLogger();`
`60`	`62`	`}`
`61`	`63`
`62`	`64`	`#endif // guard_logger_h_0d9702a6_c7ca_4260_baff_7fc1b3c1dec5_`
Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ namespace cage`
`60`	`60`	`loggerLast()->next = this;`
`61`	`61`	`}`
`62`	`62`	`loggerLast() = this;`
`63`		`- output.bind<&logOutputStdErr>();`
	`63`	`+ output.bind<logOutputStdErr>();`
`64`	`64`	`}`
`65`	`65`
`66`	`66`	`~LoggerImpl()`
`@@ -98,12 +98,12 @@ namespace cage`
`98`	`98`	`if (detail::isDebugging())`
`99`	`99`	`{`
`100`	`100`	`loggerDebug = newLogger();`
`101`		`- loggerDebug->format.bind<&logFormatConsole>();`
`102`		`- loggerDebug->output.bind<&logOutputDebug>();`
	`101`	`+ loggerDebug->format.bind<logFormatConsole>();`
	`102`	`+ loggerDebug->output.bind<logOutputDebug>();`
`103`	`103`	`}`
`104`	`104`
`105`	`105`	`loggerFile = newLogger();`
`106`		`- loggerFile->format.bind<&logFormatFileShort>();`
	`106`	`+ loggerFile->format.bind<logFormatFileShort>();`
`107`	`107`
`108`	`108`	`try`
`109`	`109`	`{`
`@@ -456,5 +456,22 @@ namespace cage`
`456`	`456`	`CAGE_LOG(SeverityEnum::Info, "log", Stringizer() + "total duration: " + duration + " days, " + hours + " hours, " + mins + " minutes, " + secs + " seconds and " + micros + " microseconds");`
`457`	`457`	`}`
`458`	`458`	`} initialLogInstance;`
	`459`	`+`
	`460`	`+ struct ConsoleLogger : private Immovable`
	`461`	`+ {`
	`462`	`+ Holder<Logger> conLog = newLogger();`
	`463`	`+`
	`464`	`+ ConsoleLogger()`
	`465`	`+ {`
	`466`	`+ conLog->format.bind<logFormatConsole>();`
	`467`	`+ conLog->output.bind<logOutputStdOut>();`
	`468`	`+ }`
	`469`	`+ };`
	`470`	`+ }`
	`471`	`+`
	`472`	`+ Logger *initializeConsoleLogger()`
	`473`	`+ {`
	`474`	`+ static ConsoleLogger *inst = new ConsoleLogger(); // intentional leak`
	`475`	`+ return +inst->conLog;`
`459`	`476`	`}`
`460`	`477`	`}`
Original file line number	Diff line number	Diff line change
`@@ -105,11 +105,7 @@ bool logFilter(const detail::LoggerInfo &i)`
`105`	`105`
`106`	`106`	`int main(int argc, const char *args[])`
`107`	`107`	`{`
`108`		`- Holder<Logger> log = newLogger();`
`109`		`- log->filter.bind<logFilter>();`
`110`		`- log->format.bind<logFormatConsole>();`
`111`		`- log->output.bind<logOutputStdOut>();`
`112`		`-`
	`108`	`+ initializeConsoleLogger()->filter.bind<logFilter>();`
`113`	`109`	`try`
`114`	`110`	`{`
`115`	`111`	`Holder<Ini> cmd = newIni();`
Original file line number	Diff line number	Diff line change
`@@ -7,10 +7,7 @@ using namespace cage;`
`7`	`7`
`8`	`8`	`int main(int argc, const char *args[])`
`9`	`9`	`{`
`10`		`- Holder<Logger> log = newLogger();`
`11`		`- log->format.bind<logFormatConsole>();`
`12`		`- log->output.bind<logOutputStdOut>();`
`13`		`-`
	`10`	`+ initializeConsoleLogger();`
`14`	`11`	`try`
`15`	`12`	`{`
`16`	`13`	`while (true)`