summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArtem Nosach <ANosach@luxoft.com>2016-06-08 17:14:16 +0300
committerArtem Nosach <ANosach@luxoft.com>2016-06-08 17:14:16 +0300
commit62d7f8f58e1f72f3c5581c3fc69e7962f7f7839c (patch)
treea5faba06730eb013572392b32f83dbea4c2428c3
parenta3b9f9408c5953a2d75dc4a49e5d15c35a782a28 (diff)
parenta7ed30796f68e0e55cb13ef0a61c1c0b9a5ea997 (diff)
downloadsdl_core-62d7f8f58e1f72f3c5581c3fc69e7962f7f7839c.tar.gz
Merge pull request #53 from OHerasym/fix/logger-dont-save-log-file
Fix logger doesn't save log file
-rw-r--r--src/appMain/main.cc1
-rw-r--r--src/components/include/utils/logger.h5
-rw-r--r--src/components/utils/test/auto_trace_test.cc1
3 files changed, 6 insertions, 1 deletions
diff --git a/src/appMain/main.cc b/src/appMain/main.cc
index ca98c3364a..f1214f1d88 100644
--- a/src/appMain/main.cc
+++ b/src/appMain/main.cc
@@ -34,6 +34,7 @@
#include "utils/logger.h"
#include "config_profile/profile.h"
#include "life_cycle.h"
+#include "utils/appenders_loader.h"
/**
* \brief Entry point of the program.
diff --git a/src/components/include/utils/logger.h b/src/components/include/utils/logger.h
index d67bd9e925..2e9167c352 100644
--- a/src/components/include/utils/logger.h
+++ b/src/components/include/utils/logger.h
@@ -111,7 +111,10 @@ class Logger {
#undef INIT_LOGGER
#if defined(LOG4CXX_LOGGER)
-#define INIT_LOGGER(logs_enabled) \
+#define INIT_LOGGER(logs_enabled) \
+ if (logs_enabled) { \
+ DCHECK(utils::appenders_loader.Loaded()); \
+ } \
logger::Logger::InitLogger(logs_enabled, "log4cxx.properties");
#else
#define INIT_LOGGER(logs_enabled) \
diff --git a/src/components/utils/test/auto_trace_test.cc b/src/components/utils/test/auto_trace_test.cc
index c2128d7285..3125445261 100644
--- a/src/components/utils/test/auto_trace_test.cc
+++ b/src/components/utils/test/auto_trace_test.cc
@@ -42,6 +42,7 @@
#include "utils/threads/thread.h"
#include "utils/date_time.h"
#include "utils/helpers.h"
+#include "utils/appenders_loader.h"
namespace test {
namespace components {