mirror of
				https://github.com/Icinga/icinga2.git
				synced 2025-10-31 19:24:25 +01:00 
			
		
		
		
	This commit removes EmbeddedNamespaceValue and ConstEmbeddedNamespaceValue and reduces NamespaceValue down to a simple struct without inheritance or member functions. The code from these clases is inlined into the Namespace class. The class hierarchy determining whether a value is const is moved to an attribute of NamespaceValue. This is done in preparation for changes to the locking in the Namespace class. Currently, it relies on a recursive mutex. In the future, a shared mutex (read/write lock) should be used instead, which cannot allow recursive locking (without failing or risk deadlocking on lock upgrades). With this change, all operations requiring a lock for one operation are within one function, no recursive locking is not needed any more.
		
			
				
	
	
		
			55 lines
		
	
	
		
			1.3 KiB
		
	
	
	
		
			C++
		
	
	
	
	
	
			
		
		
	
	
			55 lines
		
	
	
		
			1.3 KiB
		
	
	
	
		
			C++
		
	
	
	
	
	
| /* Icinga 2 | (c) 2012 Icinga GmbH | GPLv2+ */
 | |
| 
 | |
| #include "icingadb/icingadb.hpp"
 | |
| #include "base/application.hpp"
 | |
| #include "base/json.hpp"
 | |
| #include "base/logger.hpp"
 | |
| #include "base/serializer.hpp"
 | |
| #include "base/statsfunction.hpp"
 | |
| #include "base/convert.hpp"
 | |
| 
 | |
| using namespace icinga;
 | |
| 
 | |
| Dictionary::Ptr IcingaDB::GetStats()
 | |
| {
 | |
| 	Dictionary::Ptr stats = new Dictionary();
 | |
| 
 | |
| 	//TODO: Figure out if more stats can be useful here.
 | |
| 	Namespace::Ptr statsFunctions = ScriptGlobal::Get("StatsFunctions", &Empty);
 | |
| 
 | |
| 	if (!statsFunctions)
 | |
| 		Dictionary::Ptr();
 | |
| 
 | |
| 	ObjectLock olock(statsFunctions);
 | |
| 
 | |
| 	for (auto& kv : statsFunctions)
 | |
| 	{
 | |
| 		Function::Ptr func = kv.second.Val;
 | |
| 
 | |
| 		if (!func)
 | |
| 			BOOST_THROW_EXCEPTION(std::invalid_argument("Invalid status function name."));
 | |
| 
 | |
| 		Dictionary::Ptr status = new Dictionary();
 | |
| 		Array::Ptr perfdata = new Array();
 | |
| 		func->Invoke({ status, perfdata });
 | |
| 
 | |
| 		stats->Set(kv.first, new Dictionary({
 | |
| 			{ "status", status },
 | |
| 			{ "perfdata", Serialize(perfdata, FAState) }
 | |
| 		}));
 | |
| 	}
 | |
| 
 | |
| 	typedef Dictionary::Ptr DP;
 | |
| 	DP app = DP(DP(DP(stats->Get("IcingaApplication"))->Get("status"))->Get("icingaapplication"))->Get("app");
 | |
| 
 | |
| 	app->Set("program_start", TimestampToMilliseconds(Application::GetStartTime()));
 | |
| 
 | |
| 	auto localEndpoint (Endpoint::GetLocalEndpoint());
 | |
| 	if (localEndpoint) {
 | |
| 		app->Set("endpoint_id", GetObjectIdentifier(localEndpoint));
 | |
| 	}
 | |
| 
 | |
| 	return stats;
 | |
| }
 | |
| 
 |