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

Fix logging during shutdown procedure.

Browse Source 
Refs #5788
This commit is contained in:
Gerd von Egidy 2014-04-27 23:40:37 +02:00 committed by Gunnar Beutner
parent 3a294bbd5d
commit 3ece2ba643
3 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
icinga-app/icinga.cpp
View File

@ -200,10 +200,9 @@ static void TerminateAndWaitForEnd(pid_t target)
int ret = kill(target, SIGTERM); int ret = kill(target, SIGTERM);
while(Utility::GetTime() < timeout && (ret==0 || errno!=ESRCH)) while (Utility::GetTime() < timeout && (ret == 0 || errno != ESRCH)) {
{
Utility::Sleep(0.1); Utility::Sleep(0.1);
ret = kill(target, SIGTERM); ret = kill(target, 0);
} }
// timeout and the process still seems to live: kill it // timeout and the process still seems to live: kill it

9
lib/base/streamlogger.cpp
View File

@ -42,6 +42,15 @@ void StreamLogger::Start(void)
m_Tty = false; m_Tty = false;
} }
void StreamLogger::Stop(void)
{
Logger::Stop();
// make sure we flush the log data on shutdown, even if we don't call the destructor
if (m_Stream)
m_Stream->flush();
}
/** /**
* Destructor for the StreamLogger class. * Destructor for the StreamLogger class.
*/ */

1
lib/base/streamlogger.h
View File

@ -39,6 +39,7 @@ public:
DECLARE_PTR_TYPEDEFS(StreamLogger); DECLARE_PTR_TYPEDEFS(StreamLogger);
virtual void Start(void); virtual void Start(void);
virtual void Stop(void);
~StreamLogger(void); ~StreamLogger(void);
void BindStream(std::ostream *stream, bool ownsStream); void BindStream(std::ostream *stream, bool ownsStream);