tyler.durden/icinga2
1
0
Fork 0
mirror of https://github.com/Icinga/icinga2.git synced 2025-07-26 07:04:37 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7961 from Icinga/bugfix/startup-log

Browse Source 
Place startup.log and status in /var/lib/icinga2/api, not /var/lib/icinga2/api/zones-stage
This commit is contained in:
Julian Brost 2022-04-11 14:41:07 +02:00 committed by GitHub
commit 0e880048ee
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/remote/apilistener-filesync.cpp
View File

@ -592,15 +592,16 @@ void ApiListener::TryActivateZonesStage(const std::vector<String>& relativePaths
process->Run(); process->Run();
const ProcessResult& pr = process->WaitForResult(); const ProcessResult& pr = process->WaitForResult();
String apiDir = GetApiDir();
String apiZonesDir = GetApiZonesDir(); String apiZonesDir = GetApiZonesDir();
String apiZonesStageDir = GetApiZonesStageDir(); String apiZonesStageDir = GetApiZonesStageDir();
String logFile = apiZonesStageDir + "/startup.log"; String logFile = apiDir + "/zones-stage-startup.log";
std::ofstream fpLog(logFile.CStr(), std::ofstream::out | std::ostream::binary | std::ostream::trunc); std::ofstream fpLog(logFile.CStr(), std::ofstream::out | std::ostream::binary | std::ostream::trunc);
fpLog << pr.Output; fpLog << pr.Output;
fpLog.close(); fpLog.close();
String statusFile = apiZonesStageDir + "/status"; String statusFile = apiDir + "/zones-stage-status";
std::ofstream fpStatus(statusFile.CStr(), std::ofstream::out | std::ostream::binary | std::ostream::trunc); std::ofstream fpStatus(statusFile.CStr(), std::ofstream::out | std::ostream::binary | std::ostream::trunc);
fpStatus << pr.ExitStatus; fpStatus << pr.ExitStatus;
fpStatus.close(); fpStatus.close();
@ -644,10 +645,15 @@ void ApiListener::TryActivateZonesStage(const std::vector<String>& relativePaths
return; return;
} }
String failedLogFile = apiDir + "/zones-stage-startup-last-failed.log";
std::ofstream fpFailedLog(failedLogFile.CStr(), std::ofstream::out | std::ostream::binary | std::ostream::trunc);
fpFailedLog << pr.Output;
fpFailedLog.close();
// Error case. // Error case.
Log(LogCritical, "ApiListener") Log(LogCritical, "ApiListener")
<< "Config validation failed for staged cluster config sync in '" << apiZonesStageDir << "Config validation failed for staged cluster config sync in '" << apiZonesStageDir
<< "'. Aborting. Logs: '" << logFile << "'"; << "'. Aborting. Logs: '" << failedLogFile << "'";
ApiListener::Ptr listener = ApiListener::GetInstance(); ApiListener::Ptr listener = ApiListener::GetInstance();