Add shutDown func

L1MeN9Yu · Oct 17, 2019 · 0d8ba18 · 0d8ba18
1 parent d7fdd03
commit 0d8ba18
Show file tree

Hide file tree

Showing 8 changed files with 23 additions and 3 deletions.
diff --git a/Senna/Backend/SennaContext/SennaContext.Base.cpp b/Senna/Backend/SennaContext/SennaContext.Base.cpp
@@ -26,3 +26,7 @@ void SennaContext::createLogger(const char *name, spdlog::level::level_enum leve
 void SennaContext::dropLogger(const char *name) {
     spdlog::drop(name);
 }
+
+void SennaContext::shutDown(void) {
+    spdlog::shutdown();
+}
diff --git a/Senna/Backend/SennaContext/SennaContext.cpp b/Senna/Backend/SennaContext/SennaContext.cpp
@@ -22,4 +22,4 @@ SennaContext::SennaContext() {
     p_default_logger->set_level(spdlog::level::trace);
     p_default_logger->trace("Senna Start Succeed ! [spdlog version {}.{}.{} !] [fmt version {} !]", SPDLOG_VER_MAJOR, SPDLOG_VER_MINOR, SPDLOG_VER_PATCH, FMT_VERSION);
     spdlog::set_default_logger(p_default_logger);
-}
+}
diff --git a/Senna/Backend/SennaContext/SennaContext.h b/Senna/Backend/SennaContext/SennaContext.h
@@ -86,6 +86,8 @@ class SennaContext {
      */
     void enableDailyFileLog(const char *name, spdlog::level::level_enum level, const char *pattern, const char *file_path, int hour, int minute);
 
+    void shutDown(void);
+
 private:
     std::shared_ptr<spdlog::logger> p_default_logger;
 

diff --git a/Senna/Bridge/Bridge.Core.swift b/Senna/Bridge/Bridge.Core.swift
@@ -11,6 +11,9 @@ func senna_add_logger(_ name: UnsafePointer<Int8>, _ flag: UInt32, _ pattern: Un
 @_silgen_name("senna_drop_logger")
 func senna_drop_logger(_ name: UnsafePointer<Int8>)
 
+@_silgen_name("senna_shutdown")
+func senna_shutdown()
+
 @_silgen_name("senna_logger_flush")
 func senna_logger_flush(_ name: UnsafePointer<Int8>)
 

diff --git a/Senna/Bridge/Bridge.Senna.Core.cpp b/Senna/Bridge/Bridge.Senna.Core.cpp
@@ -47,3 +47,7 @@ void senna_logger_enable_daily_file(const char *name, unsigned int flag, const c
     spdlog::level::level_enum level = spdlog::level::level_enum(flag);
     Singleton<SennaContext>::sharedInstance()->enableDailyFileLog(name, level, pattern, file_path, hour, minute);
 }
+
+void senna_shutdown(void) {
+    Singleton<SennaContext>::sharedInstance()->shutDown();
+}
diff --git a/Senna/Bridge/Bridge.Senna.Core.h b/Senna/Bridge/Bridge.Senna.Core.h
@@ -22,6 +22,8 @@ extern void senna_add_logger(const char *name, unsigned int flag, const char *pa
 __attribute__((nonnull (1)))
 extern void senna_drop_logger(const char *name);
 
+extern void senna_shutdown(void);
+
 __attribute__((nonnull (1)))
 extern void senna_logger_flush(const char *name);
 

diff --git a/Senna/Frontend/Senna.swift b/Senna/Frontend/Senna.swift
@@ -46,4 +46,8 @@ var __messageConvert: MessageConvert = { message, filename, function, line in
     return allMessage
 }
 
-public let DefaultPattern = "[%D %T] [%=10n] %^[process id : %P] [thread id : %t] [%8l] %v%$"
+public let DefaultPattern = "[%D %T] [%=10n] %^[process id : %P] [thread id : %t] [%8l] %v%$"
+
+public func shutDown() {
+    senna_shutdown()
+}
diff --git a/SennaDemo-iOS/DemoList/DemoListViewController.swift b/SennaDemo-iOS/DemoList/DemoListViewController.swift
@@ -5,6 +5,7 @@
 
 import Foundation
 import SwiftUI
+import Senna
 
 class DemoListViewController: UIHostingController<ContentView> {
     private lazy var logger = {
@@ -25,7 +26,7 @@ class DemoListViewController: UIHostingController<ContentView> {
         logger.error(message: "error")
         logger.critical(message: "critical")
 
-        logger.flush()
+        Senna.shutDown()
     }
 
     @objc required dynamic init?(coder aDecoder: NSCoder) {