diff --git a/common/cpp/src/configuration.cpp b/common/cpp/src/configuration.cpp index d42d487e9cbb7db6d3351d57a74d42c1342dc4dd..a2674dcb08d101b73a4835dde91d31b97f6865e8 100644 --- a/common/cpp/src/configuration.cpp +++ b/common/cpp/src/configuration.cpp @@ -129,20 +129,36 @@ static bool mergeConfig(const string &path) { */ static bool findConfiguration(const string &file, const vector<string> &paths, const std::string &app) { + bool f = false; bool found = false; - found |= mergeConfig(FTL_GLOBAL_CONFIG_ROOT "/config.json"); - found |= mergeConfig(FTL_LOCAL_CONFIG_ROOT "/config.json"); - found |= mergeConfig("./config.json"); + f = mergeConfig(FTL_GLOBAL_CONFIG_ROOT "/config.json"); + found |= f; + if (f) LOG(INFO) << "Loaded config: " << FTL_GLOBAL_CONFIG_ROOT "/config.json"; + f = mergeConfig(FTL_LOCAL_CONFIG_ROOT "/config.json"); + found |= f; + if (f) LOG(INFO) << "Loaded config: " << FTL_LOCAL_CONFIG_ROOT "/config.json"; + f = mergeConfig("./config.json"); + found |= f; + if (f) LOG(INFO) << "Loaded config: " << "./config.json"; for (auto p : paths) { if (is_directory(p)) { - found |= mergeConfig(p+"/config.json"); + f = mergeConfig(p+"/config.json"); + found |= f; + if (f) LOG(INFO) << "Loaded config: " << p << "/config.json"; } } if (file != "") { - found |= mergeConfig(file); + f = mergeConfig(file); + found |= f; + + if (!f) { + LOG(ERROR) << "Specific config file (" << file << ") was not found"; + } else { + LOG(INFO) << "Loaded config: " << file; + } } if (found) { diff --git a/vision/src/main.cpp b/vision/src/main.cpp index 0665b797cdb017c09dbafdfcf5f0dd9011f5ead4..70edfd239e89ab02e8e7ce972136637488ed0d2f 100644 --- a/vision/src/main.cpp +++ b/vision/src/main.cpp @@ -144,9 +144,7 @@ static void run(const string &file) { //sync->get(ftl::LEFT, l); //sync->get(ftl::RIGHT, r); - LOG(INFO) << "PRE DISPARITY"; disparity->compute(l, r, disp); - LOG(INFO) << "POST DISPARITY"; unique_lock<mutex> lk(m); jobs++;