diff options
| author | Justin Dickow <jjdickow@gmail.com> | 2015-01-24 16:58:15 -0500 |
|---|---|---|
| committer | Justin Dickow <jjdickow@gmail.com> | 2015-01-24 16:58:15 -0500 |
| commit | a24079cb8de5563376dcf782cdb9fe3cae063841 (patch) | |
| tree | 1fca30dde1aa30c7ac11fb6b009d2bd6420bd648 /src/appMain/main.cc | |
| parent | f948dd4539eeecb2c32084cc39b68923fc94e3dd (diff) | |
| download | sdl_core-a24079cb8de5563376dcf782cdb9fe3cae063841.tar.gz | |
HmiStatus modify
HU DCHECK occurs during multisession registration
Remove unused variable
SIGSEGV handler added to flush logger queue
FixIncomplete device list in UpdateDeviceList request
Fix Memory leak on PutFile break
Fix Thread and Timer
Fix OnHmiStatus Notification
Fix Url array sending for endpoints.
Fix HashChange
Fix SDL parse incoming JSON message with both members error and result as success message
Fix Core crashes while connecting mobile app
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, 4 insertions, 14 deletions
diff --git a/src/appMain/main.cc b/src/appMain/main.cc index 331b0397ee..27e0eef2a3 100644 --- a/src/appMain/main.cc +++ b/src/appMain/main.cc @@ -176,10 +176,7 @@ 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_ERROR(logger_, "Failed initialization of policy database"); -#ifdef ENABLE_LOG - logger::LogMessageLoopThread::destroy(); -#endif + LOG4CXX_FATAL(logger_, "Failed to init policy database"); DEINIT_LOGGER(); exit(EXIT_FAILURE); } @@ -187,10 +184,8 @@ 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); } @@ -199,7 +194,7 @@ int32_t main(int32_t argc, char** argv) { // Third-Party components initialization. if (!main_namespace::LifeCycle::instance()->InitMessageSystem()) { - main_namespace::LifeCycle::instance()->StopComponents(); + LOG4CXX_FATAL(logger_, "Failed to init message system"); DEINIT_LOGGER(); exit(EXIT_FAILURE); } @@ -211,10 +206,8 @@ 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); } @@ -230,9 +223,6 @@ 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; |