tyler.durden
/
icinga2
mirror of https://github.com/Icinga/icinga2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "Respect activation priority also on deactivation" 

This reverts commit 8ad1717055.
This commit is contained in:
Michael Friedrich 2019-02-19 14:30:44 +01:00
parent 4edd3ece66
commit 5da1cbd096
1 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/base/configobject.cpp
View File

@ -33,7 +33,6 @@
#include "base/workqueue.hpp" #include "base/workqueue.hpp"
#include "base/context.hpp" #include "base/context.hpp"
#include "base/application.hpp" #include "base/application.hpp"
#include <algorithm>
#include <fstream> #include <fstream>
#include <boost/exception/errinfo_api_function.hpp> #include <boost/exception/errinfo_api_function.hpp>
#include <boost/exception/errinfo_errno.hpp> #include <boost/exception/errinfo_errno.hpp>
@ -618,13 +617,7 @@ void ConfigObject::RestoreObjects(const String& filename, int attributeTypes)
void ConfigObject::StopObjects() void ConfigObject::StopObjects()
{ {
auto types = Type::GetAllTypes(); for (const Type::Ptr& type : Type::GetAllTypes()) {
std::sort(types.begin(), types.end(), [](const Type::Ptr& a, const Type::Ptr& b) {
return a->GetActivationPriority() > b->GetActivationPriority();
});
for (const Type::Ptr& type : types) {
auto *dtype = dynamic_cast<ConfigType *>(type.get()); auto *dtype = dynamic_cast<ConfigType *>(type.get());
if (!dtype) if (!dtype)