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

Fix: IDO marks objects as inactive on shutdown

Browse Source 
fixes #12418
This commit is contained in:
Gunnar Beutner 2016-08-17 19:24:22 +02:00
parent e5566a6bd8
commit 62a6d5667d
3 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/base/application.cpp
View File

@ -324,6 +324,11 @@ mainloop:
UninitializeBase(); UninitializeBase();
} }
bool Application::IsShuttingDown(void)
{
return m_ShuttingDown;
}
void Application::OnShutdown(void) void Application::OnShutdown(void)
{ {
/* Nothing to do here. */ /* Nothing to do here. */

2
lib/base/application.hpp
View File

@ -73,6 +73,8 @@ public:
static void RequestRestart(void); static void RequestRestart(void);
static void RequestReopenLogs(void); static void RequestReopenLogs(void);
static bool IsShuttingDown(void);
static void SetDebuggingSeverity(LogSeverity severity); static void SetDebuggingSeverity(LogSeverity severity);
static LogSeverity GetDebuggingSeverity(void); static LogSeverity GetDebuggingSeverity(void);

2
lib/db_ido/dbconnection.cpp
View File

@ -430,7 +430,7 @@ bool DbConnection::GetStatusUpdate(const DbObject::Ptr& dbobj) const
void DbConnection::UpdateObject(const ConfigObject::Ptr& object) void DbConnection::UpdateObject(const ConfigObject::Ptr& object)
{ {
if (!GetConnected()) if (!GetConnected() || Application::IsShuttingDown())
return; return;
DbObject::Ptr dbobj = DbObject::GetOrCreateByObject(object); DbObject::Ptr dbobj = DbObject::GetOrCreateByObject(object);