diff options
| author | Justin Dickow <jjdickow@gmail.com> | 2015-01-26 11:15:48 -0500 |
|---|---|---|
| committer | Justin Dickow <jjdickow@gmail.com> | 2015-01-26 11:15:48 -0500 |
| commit | 46ed776c537131e72747538488b213cf45f23e22 (patch) | |
| tree | 4cad1abf411addfd72ab591c93edeb5d225d9a39 /src/appMain/main.cc | |
| parent | a24079cb8de5563376dcf782cdb9fe3cae063841 (diff) | |
| download | sdl_core-46ed776c537131e72747538488b213cf45f23e22.tar.gz | |
Latest internal release - last bulk merge before pull request and gitflow!?
Smoke tested on Ubuntu 12.04
Signed-off-by: Justin Dickow <jjdickow@gmail.com>
Diffstat (limited to 'src/appMain/main.cc')
| -rw-r--r-- | src/appMain/main.cc | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/src/appMain/main.cc b/src/appMain/main.cc index 27e0eef2a3..331b0397ee 100644 --- a/src/appMain/main.cc +++ b/src/appMain/main.cc @@ -176,7 +176,10 @@ int32_t main(int32_t argc, char** argv) { #ifdef __QNX__ if (profile::Profile::instance()->enable_policy()) { if (!utils::System("./init_policy.sh").Execute(true)) { - LOG4CXX_FATAL(logger_, "Failed to init policy database"); + LOG4CXX_ERROR(logger_, "Failed initialization of policy database"); +#ifdef ENABLE_LOG + logger::LogMessageLoopThread::destroy(); +#endif DEINIT_LOGGER(); exit(EXIT_FAILURE); } @@ -184,8 +187,10 @@ int32_t main(int32_t argc, char** argv) { #endif // __QNX__ if (!main_namespace::LifeCycle::instance()->StartComponents()) { - LOG4CXX_FATAL(logger_, "Failed to start components"); main_namespace::LifeCycle::instance()->StopComponents(); +#ifdef ENABLE_LOG + logger::LogMessageLoopThread::destroy(); +#endif DEINIT_LOGGER(); exit(EXIT_FAILURE); } @@ -194,7 +199,7 @@ int32_t main(int32_t argc, char** argv) { // Third-Party components initialization. if (!main_namespace::LifeCycle::instance()->InitMessageSystem()) { - LOG4CXX_FATAL(logger_, "Failed to init message system"); + main_namespace::LifeCycle::instance()->StopComponents(); DEINIT_LOGGER(); exit(EXIT_FAILURE); } @@ -206,8 +211,10 @@ int32_t main(int32_t argc, char** argv) { #ifndef NO_HMI if (!InitHmi()) { - LOG4CXX_FATAL(logger_, "Failed to init HMI"); main_namespace::LifeCycle::instance()->StopComponents(); +#ifdef ENABLE_LOG + logger::LogMessageLoopThread::destroy(); +#endif DEINIT_LOGGER(); exit(EXIT_FAILURE); } @@ -223,6 +230,9 @@ int32_t main(int32_t argc, char** argv) { main_namespace::LifeCycle::instance()->StopComponents(); LOG4CXX_INFO(logger_, "Application successfully stopped"); +#ifdef ENABLE_LOG + logger::LogMessageLoopThread::destroy(); +#endif DEINIT_LOGGER(); return EXIT_SUCCESS; |