Add deinitialize() to allow deinit without Initializer.

wilx · wilx · commit 25185bc52efd · 2018-09-06T23:15:03.000+02:00
Also, to make the API symetric with a counterpart of `initialize()`.
diff --git a/include/log4cplus/config.hxx b/include/log4cplus/config.hxx
@@ -190,8 +190,15 @@ namespace log4cplus
 LOG4CPLUS_EXPORT void threadCleanup ();
 
 //! Initializes log4cplus.
+//!
+//! \note using `log4cplus::Initializer` is preferred
 LOG4CPLUS_EXPORT void initialize ();
 
+//! Deinitializes log4cplus.
+//!
+//! \note using `log4cplus::Initializer` is preferred
+LOG4CPLUS_EXPORT void deinitialize ();
+
 //! Set thread pool size.
 LOG4CPLUS_EXPORT void setThreadPoolSize (std::size_t pool_size);
 
diff --git a/src/global-init.cxx b/src/global-init.cxx
@@ -112,8 +112,7 @@ Initializer::~Initializer ()
         if (InitializerImpl::instance->count == 0)
         {
             destroy = true;
-            shutdownThreadPool();
-            Logger::shutdown ();
+            deinitialize ();
         }
     }
     if (destroy)
@@ -499,6 +498,14 @@ initialize ()
 }
 
 
+void
+deinitialize ()
+{
+    shutdownThreadPool();
+    Logger::shutdown ();
+}
+
+
 void
 threadCleanup ()
 {

Original file line number	Diff line number	Diff line change
`@@ -112,8 +112,7 @@ Initializer::~Initializer ()`
`112`	`112`	`if (InitializerImpl::instance->count == 0)`
`113`	`113`	`{`
`114`	`114`	`destroy = true;`
`115`		`- shutdownThreadPool();`
`116`		`- Logger::shutdown ();`
	`115`	`+ deinitialize ();`
`117`	`116`	`}`
`118`	`117`	`}`
`119`	`118`	`if (destroy)`
`@@ -499,6 +498,14 @@ initialize ()`
`499`	`498`	`}`
`500`	`499`
`501`	`500`
	`501`	`+void`
	`502`	`+deinitialize ()`
	`503`	`+{`
	`504`	`+ shutdownThreadPool();`
	`505`	`+ Logger::shutdown ();`
	`506`	`+}`
	`507`	`+`
	`508`	`+`
`502`	`509`	`void`
`503`	`510`	`threadCleanup ()`
`504`	`511`	`{`