nils/ebusd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

more verbosity on config file loading

Browse Source
This commit is contained in:
John
2022-02-13 20:41:29 +01:00
parent c3cdf9f1fb
commit a302b15c1c
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ebusd/main.cpp
+6 -2
View File
@@ -826,6 +826,7 @@ static result_t collectConfigFiles(const string& relPath, const string& prefix,
return RESULT_OK; return RESULT_OK;
} }
const string path = s_configLocalPrefix + relPathWithSlash; const string path = s_configLocalPrefix + relPathWithSlash;
logDebug(lf_main, "reading directory %s", path.c_str());
DIR* dir = opendir(path.c_str()); DIR* dir = opendir(path.c_str());
if (dir == nullptr) { if (dir == nullptr) {
return RESULT_ERR_NOTFOUND; return RESULT_ERR_NOTFOUND;
@@ -837,10 +838,13 @@ static result_t collectConfigFiles(const string& relPath, const string& prefix,
continue; continue;
} }
const string p = path + name; const string p = path + name;
struct stat stat_buf; struct stat stat_buf = {};
if (stat(p.c_str(), &stat_buf) != 0) { if (stat(p.c_str(), &stat_buf) != 0) {
logError(lf_main, "unable to stat file %s", p.c_str());
continue; continue;
} }
logDebug(lf_main, "file type of %s is %s", p.c_str(),
S_ISDIR(stat_buf.st_mode) ? "dir" : S_ISREG(stat_buf.st_mode) ? "file" : "other");
if (S_ISDIR(stat_buf.st_mode)) { if (S_ISDIR(stat_buf.st_mode)) {
if (dirs != nullptr) { if (dirs != nullptr) {
dirs->push_back(relPathWithSlash + name); dirs->push_back(relPathWithSlash + name);
@@ -1044,7 +1048,7 @@ result_t loadConfigFiles(MessageMap* messages, bool verbose, bool denyRecursive)
result_t result = readConfigFiles("", ".csv", result_t result = readConfigFiles("", ".csv",
(!s_opt.scanConfig || s_opt.checkConfig) && !denyRecursive, verbose, &errorDescription, messages); (!s_opt.scanConfig || s_opt.checkConfig) && !denyRecursive, verbose, &errorDescription, messages);
if (result == RESULT_OK) { if (result == RESULT_OK) {
logInfo(lf_main, "read config files"); logInfo(lf_main, "read config files, got %d messages", messages->size());
} else { } else {
logError(lf_main, "error reading config files from %s: %s, last error: %s", s_opt.configPath, logError(lf_main, "error reading config files from %s: %s, last error: %s", s_opt.configPath,
getResultCode(result), errorDescription.c_str()); getResultCode(result), errorDescription.c_str());