From: Michael Friedrich <michael.friedrich@icinga.com>
Date: Mon, 13 May 2019 09:22:55 +0000 (+0200)
Subject: Apply ReloadTimeout for 2.11
X-Git-Tag: v2.11.0-rc1~59^2~7
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=af8624dcf1c4bf5e0bcabaad251e8e8f3c2c2a64;p=icinga2

Apply ReloadTimeout for 2.11
---

diff --git a/lib/remote/apilistener-filesync.cpp b/lib/remote/apilistener-filesync.cpp
index e9a54a88f..bd592afaf 100644
--- a/lib/remote/apilistener-filesync.cpp
+++ b/lib/remote/apilistener-filesync.cpp
@@ -8,6 +8,7 @@
 #include "base/configtype.hpp"
 #include "base/logger.hpp"
 #include "base/convert.hpp"
+#include "base/application.hpp"
 #include "base/exception.hpp"
 #include "base/utility.hpp"
 #include <fstream>
@@ -564,7 +565,7 @@ void ApiListener::AsyncTryActivateZonesStage(const std::vector<String>& relative
 	args->Add("System.ZonesStageVarDir=" + GetApiZonesStageDir());
 
 	Process::Ptr process = new Process(Process::PrepareCommand(args));
-	process->SetTimeout(300);
+	process->SetTimeout(Application::GetReloadTimeout());
 	process->Run(std::bind(&TryActivateZonesStageCallback, _1, relativePaths));
 }