diff options
| author | Dirk Huss <dirk_huss@mentor.com> | 2016-05-25 19:00:32 +0200 |
|---|---|---|
| committer | Dirk Huss <dirk_huss@mentor.com> | 2016-05-25 19:00:32 +0200 |
| commit | 534894b27a5e6b86cf8d2bd7b53d55d04f2a1bcc (patch) | |
| tree | 3ee994cc8d94f3c5e96c1b88dd15bc9d58e81e89 /src/CommonAPI/Runtime.cpp | |
| parent | 1c158272e2ee4b93021a97ac3b5c207a137b0d2c (diff) | |
| download | genivi-common-api-runtime-534894b27a5e6b86cf8d2bd7b53d55d04f2a1bcc.tar.gz | |
CommonAPI 3.1.83.1.8
Diffstat (limited to 'src/CommonAPI/Runtime.cpp')
| -rw-r--r-- | src/CommonAPI/Runtime.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/CommonAPI/Runtime.cpp b/src/CommonAPI/Runtime.cpp index 1d0b0c5..6ba6864 100644 --- a/src/CommonAPI/Runtime.cpp +++ b/src/CommonAPI/Runtime.cpp @@ -132,9 +132,9 @@ void Runtime::initFactories() { std::lock_guard<std::mutex> itsLock(factoriesMutex_); if (!isInitialized_) { + COMMONAPI_INFO("Loading configuration file \'", usedConfig_, "\'"); COMMONAPI_INFO("Using default binding \'", defaultBinding_, "\'"); COMMONAPI_INFO("Using default shared library folder \'", defaultFolder_, "\'"); - COMMONAPI_INFO("Using default configuration file \'", defaultConfig_, "\'"); if (defaultFactory_) defaultFactory_->init(); @@ -156,18 +156,18 @@ Runtime::readConfiguration() { #else if (getcwd(currentDirectory, MAX_PATH_LEN)) { #endif - config = currentDirectory; - config += "/"; - config += COMMONAPI_DEFAULT_CONFIG_FILE; + usedConfig_ = currentDirectory; + usedConfig_ += "/"; + usedConfig_ += COMMONAPI_DEFAULT_CONFIG_FILE; struct stat s; - if (stat(config.c_str(), &s) != 0) { - config = defaultConfig_; + if (stat(usedConfig_.c_str(), &s) != 0) { + usedConfig_ = defaultConfig_; } } IniFileReader reader; - if (!reader.load(config)) + if (!reader.load(usedConfig_)) return false; std::string itsConsole("true"); |