Fix handling of m_RequestRestart in RunEventLoop, improve reload timeout

Refs #5788

diff --git a/lib/base/application.cpp b/lib/base/application.cpp
index a3a6029051cb6b211872ba5503d72372eeedb7f7..6cef2b83f143fa6a203d01def4f126c6a7cc3327 100644 (file)
--- a/lib/base/application.cpp
+++ b/lib/base/application.cpp
@@ -240,19 +240,19 @@ mainloop:
                }
 
                lastLoop = now;
-
-               if (m_RequestRestart) {
-                       m_RequestRestart = false;         // we are now handling the request, once is enough
+       }
                
-                       // are we already restarting? ignore request if we already are
-                       if (m_Restarting)
-                               goto mainloop;
-
-                       m_Restarting = true;
-                       StartReloadProcess();
+       if (m_RequestRestart) {
+               m_RequestRestart = false;         // we are now handling the request, once is enough
 
+               // are we already restarting? ignore request if we already are
+               if (m_Restarting)
                        goto mainloop;
-               }
+
+               m_Restarting = true;
+               StartReloadProcess();
+
+               goto mainloop;
        }
        
        Log(LogInformation, "base", "Shutting down Icinga...");
@@ -289,7 +289,7 @@ void Application::StartReloadProcess(void) const
 
        Process::Ptr process = make_shared<Process>(args);
 
-       process->SetTimeout(15);
+       process->SetTimeout(300);
 
        process->Run(boost::bind(&Application::ReloadProcessCallback, _1));
 }