tidy(main):1.8.18, 优化日志打印

Author: hevake

modules/main/context_imp.cpp

@@ -30,6 +30,7 @@
 #include <tbox/base/catch_throw.h>
 #include <tbox/util/string.h>
 #include <tbox/util/json.h>
+#include <tbox/util/fs.h>
 #include <tbox/terminal/session.h>
 
 #include "main.h"
@@ -124,7 +125,7 @@ bool ContextImp::initialize(const char* proc_name, const Json &cfg)
         std::ostringstream oss;
         oss <<
             "\r\n"
-            "Welcome to '" << proc_name << "' main terminal!\r\n"
+            "Welcome to " << util::fs::Basename(proc_name) << " main terminal!\r\n"
             "\r\n"
             "This program is based on cpp-tbox which designed by Hevake Lee.\r\n"
             "Repository: https://github.com/cpp-main/cpp-tbox\r\n"

modules/main/misc.cpp

@@ -83,9 +83,9 @@ void GetAppVersion(int &major, int &minor, int &rev, int &build)
 
 __attribute__((weak)) void OnAbnormalExit() { }
 
-void SayHello()
+void SayHi()
 {
-    LogInfo("=== CPP-TBOX MAIN STARTUP ===");
+    LogImportant("=== CPP-TBOX MAIN STARTUP ===");
     LogInfo("App Describe: %s", GetAppDescribe().c_str());
 
     int major, minor, rev, build;
@@ -96,6 +96,11 @@ void SayHello()
     LogInfo("Tbox Version: %d.%d.%d", major, minor, rev);
 }
 
+void SayBye()
+{
+    LogImportant("=== CPP-TBOX MAIN END ===");
+}
+
 void AbnormalExit()
 {
     OnAbnormalExit();

modules/main/run_in_backend.cpp

@@ -44,7 +44,9 @@ extern void UninstallErrorSignals();
 extern void InstallTerminate();
 
 extern void RegisterApps(Module &root, Context &ctx);
-extern void SayHello();
+
+extern void SayHi();
+extern void SayBye();
 
 extern std::function<void()> error_exit_func;
 
@@ -92,7 +94,7 @@ void RunInBackend()
 
 void End()
 {
-    LogInfo("Bye!");
+    SayBye();
 
     LogOutput_Enable();
     _runtime->log.cleanup();
@@ -147,7 +149,7 @@ bool Start(int argc, char **argv)
     log.initialize(argv[0], ctx, js_conf);
     LogOutput_Disable();
 
-    SayHello();
+    SayHi();
 
     error_exit_func = [&] {
         log.cleanup();

modules/main/run_in_frontend.cpp

@@ -44,7 +44,9 @@ extern void UninstallErrorSignals();
 extern void InstallTerminate();
 
 extern void RegisterApps(Module &root, Context &ctx);
-extern void SayHello();
+
+extern void SayHi();
+extern void SayBye();
 
 extern std::function<void()> error_exit_func;
 
@@ -135,7 +137,7 @@ int Main(int argc, char **argv)
     log.initialize(argv[0], ctx, js_conf);
     LogOutput_Disable();
 
-    SayHello();
+    SayHi();
 
     //! 注册异常退出时的动作，在异常信号触发时调用
     error_exit_func = [&] {
@@ -162,7 +164,7 @@ int Main(int argc, char **argv)
         LogErr("Context init fail");
     }
 
-    LogInfo("Bye!");
+    SayBye();
 
     LogOutput_Enable();
     log.cleanup();

version.mk

@@ -21,4 +21,4 @@
 # TBOX版本号
 TBOX_VERSION_MAJOR := 1
 TBOX_VERSION_MINOR := 8
-TBOX_VERSION_REVISION := 17
+TBOX_VERSION_REVISION := 18