Remove name and return value for stats functions

fixes #6171

diff --git a/lib/base/filelogger.cpp b/lib/base/filelogger.cpp
index 03d9263542377cf77970837b4adfc406647575ac..a0e61eca5c014bca2012682c004cb4acd67a323c 100644 (file)
--- a/lib/base/filelogger.cpp
+++ b/lib/base/filelogger.cpp
@@ -29,7 +29,7 @@ REGISTER_TYPE(FileLogger);
 
 REGISTER_STATSFUNCTION(FileLoggerStats, &FileLogger::StatsFunc);
 
-Value FileLogger::StatsFunc(Dictionary::Ptr& status, Array::Ptr&)
+void FileLogger::StatsFunc(Dictionary::Ptr& status, Array::Ptr&)
 {
        Dictionary::Ptr nodes = new Dictionary();
 
@@ -38,8 +38,6 @@ Value FileLogger::StatsFunc(Dictionary::Ptr& status, Array::Ptr&)
        }
 
        status->Set("filelogger", nodes);
-
-       return 0;
 }
 
 /**

diff --git a/lib/base/filelogger.hpp b/lib/base/filelogger.hpp
index 941cacb3ed1bd3ac5813fa45ae611ccd74e7d06c..7557a3e039364ba1b1287185b464bfad4674ae0b 100644 (file)
--- a/lib/base/filelogger.hpp
+++ b/lib/base/filelogger.hpp
@@ -37,7 +37,7 @@ public:
        DECLARE_OBJECT(FileLogger);
        DECLARE_OBJECTNAME(FileLogger);
 
-       static Value StatsFunc(Dictionary::Ptr& status, Array::Ptr& perfdata);
+       static void StatsFunc(Dictionary::Ptr& status, Array::Ptr& perfdata);
 
        virtual void Start(void);
 

diff --git a/lib/base/statsfunction.cpp b/lib/base/statsfunction.cpp
index 2ab93cbfd1faf5d85df33ecd4d37548142ae6ed3..8b014e369330136c0cbc5a32b51764ec39809565 100644 (file)
--- a/lib/base/statsfunction.cpp
+++ b/lib/base/statsfunction.cpp
@@ -27,9 +27,9 @@ StatsFunction::StatsFunction(const Callback& function)
        : m_Callback(function)
 { }
 
-Value StatsFunction::Invoke(Dictionary::Ptr& status, Array::Ptr& perfdata)
+void StatsFunction::Invoke(Dictionary::Ptr& status, Array::Ptr& perfdata)
 {
-       return m_Callback(status, perfdata);
+       m_Callback(status, perfdata);
 }
 
 StatsFunctionRegistry *StatsFunctionRegistry::GetInstance(void)

diff --git a/lib/base/statsfunction.hpp b/lib/base/statsfunction.hpp
index 37dbf74c2809cbf5685459061e1886ecf4b96830..687df0b61e772d72cc4e498de7cf00bba331755e 100644 (file)
--- a/lib/base/statsfunction.hpp
+++ b/lib/base/statsfunction.hpp
@@ -40,11 +40,11 @@ class I2_BASE_API StatsFunction : public Object
 public:
        DECLARE_PTR_TYPEDEFS(StatsFunction);
 
-       typedef boost::function<Value (Dictionary::Ptr& status, Array::Ptr& perfdata)> Callback;
+       typedef boost::function<void (Dictionary::Ptr& status, Array::Ptr& perfdata)> Callback;
 
        StatsFunction(const Callback& function);
 
-       Value Invoke(Dictionary::Ptr& status, Array::Ptr& perfdata);
+       void Invoke(Dictionary::Ptr& status, Array::Ptr& perfdata);
 
 private:
        Callback m_Callback;

diff --git a/lib/base/sysloglogger.cpp b/lib/base/sysloglogger.cpp
index 2c9fffea4dcd171c02ba4f788477108ea517431d..4bafee7999f89522bb2308bb615e486bff1965fc 100644 (file)
--- a/lib/base/sysloglogger.cpp
+++ b/lib/base/sysloglogger.cpp
@@ -28,7 +28,7 @@ REGISTER_TYPE(SyslogLogger);
 
 REGISTER_STATSFUNCTION(SyslogLoggerStats, &SyslogLogger::StatsFunc);
 
-Value SyslogLogger::StatsFunc(Dictionary::Ptr& status, Array::Ptr&)
+void SyslogLogger::StatsFunc(Dictionary::Ptr& status, Array::Ptr&)
 {
        Dictionary::Ptr nodes = new Dictionary();
 
@@ -37,8 +37,6 @@ Value SyslogLogger::StatsFunc(Dictionary::Ptr& status, Array::Ptr&)
        }
 
        status->Set("sysloglogger", nodes);
-
-       return 0;
 }
 
 /**

diff --git a/lib/base/sysloglogger.hpp b/lib/base/sysloglogger.hpp
index d21cf27b984eece470c49b0d007c2889c270c5ba..c7a9d55ac082b616af5643beb3931f6c9b3a4630 100644 (file)
--- a/lib/base/sysloglogger.hpp
+++ b/lib/base/sysloglogger.hpp
@@ -38,7 +38,7 @@ public:
        DECLARE_OBJECT(SyslogLogger);
        DECLARE_OBJECTNAME(SyslogLogger);
 
-       static Value StatsFunc(Dictionary::Ptr& status, Array::Ptr& perfdata);
+       static void StatsFunc(Dictionary::Ptr& status, Array::Ptr& perfdata);
 
 protected:
        virtual void ProcessLogEntry(const LogEntry& entry);

diff --git a/lib/checker/checkercomponent.cpp b/lib/checker/checkercomponent.cpp
index 2e50d34662e050c0acdecab12721f7d3f182cad5..f91a5db2b85bb615f6786579483eab13db650de6 100644 (file)
--- a/lib/checker/checkercomponent.cpp
+++ b/lib/checker/checkercomponent.cpp
@@ -37,7 +37,7 @@ REGISTER_TYPE(CheckerComponent);
 
 REGISTER_STATSFUNCTION(CheckerComponentStats, &CheckerComponent::StatsFunc);
 
-Value CheckerComponent::StatsFunc(const Dictionary::Ptr& status, const Array::Ptr& perfdata)
+void CheckerComponent::StatsFunc(const Dictionary::Ptr& status, const Array::Ptr& perfdata)
 {
        Dictionary::Ptr nodes = new Dictionary();
 
@@ -57,8 +57,6 @@ Value CheckerComponent::StatsFunc(const Dictionary::Ptr& status, const Array::Pt
        }
 
        status->Set("checkercomponent", nodes);
-
-       return 0;
 }
 
 void CheckerComponent::OnConfigLoaded(void)

diff --git a/lib/checker/checkercomponent.hpp b/lib/checker/checkercomponent.hpp
index ab282aeaa3a82aa04db64700d0c123bb9fc03c62..01d63b7f486442803e34eaf0be5ec4ead9e5c227 100644 (file)
--- a/lib/checker/checkercomponent.hpp
+++ b/lib/checker/checkercomponent.hpp
@@ -72,7 +72,7 @@ public:
        virtual void Start(void);
        virtual void Stop(void);
 
-       static Value StatsFunc(const Dictionary::Ptr& status, const Array::Ptr& perfdata);
+       static void StatsFunc(const Dictionary::Ptr& status, const Array::Ptr& perfdata);
        unsigned long GetIdleCheckables(void);
        unsigned long GetPendingCheckables(void);
 

diff --git a/lib/compat/checkresultreader.cpp b/lib/compat/checkresultreader.cpp
index b2bb33b050e93cf6e2a55f35223c4a565e6ce4ce..ac2b30c15f242e1259366acc25f3797df9d57376 100644 (file)
--- a/lib/compat/checkresultreader.cpp
+++ b/lib/compat/checkresultreader.cpp
@@ -38,7 +38,7 @@ REGISTER_TYPE(CheckResultReader);
 
 REGISTER_STATSFUNCTION(CheckResultReaderStats, &CheckResultReader::StatsFunc);
 
-Value CheckResultReader::StatsFunc(const Dictionary::Ptr& status, const Array::Ptr&)
+void CheckResultReader::StatsFunc(const Dictionary::Ptr& status, const Array::Ptr&)
 {
        Dictionary::Ptr nodes = new Dictionary();
 
@@ -47,8 +47,6 @@ Value CheckResultReader::StatsFunc(const Dictionary::Ptr& status, const Array::P
        }
 
        status->Set("checkresultreader", nodes);
-
-       return 0;
 }
 
 /**

diff --git a/lib/compat/checkresultreader.hpp b/lib/compat/checkresultreader.hpp
index 9700c59eaad0690b19b4fd58e5fc2034c8143740..dd87afa9c4d518b58565e8e656acf10b2a49d485 100644 (file)
--- a/lib/compat/checkresultreader.hpp
+++ b/lib/compat/checkresultreader.hpp
@@ -38,7 +38,7 @@ public:
        DECLARE_OBJECT(CheckResultReader);
        DECLARE_OBJECTNAME(CheckResultReader);
 
-       static Value StatsFunc(const Dictionary::Ptr& status, const Array::Ptr& perfdata);
+       static void StatsFunc(const Dictionary::Ptr& status, const Array::Ptr& perfdata);
 
 protected:
        virtual void Start(void);

diff --git a/lib/compat/compatlogger.cpp b/lib/compat/compatlogger.cpp
index 2fb81a2a2bbea9af6c11b4e7c96835c13a5a41e9..4d88edbaa3128cf2ee1cdf0b490ba7413ba1c1a4 100644 (file)
--- a/lib/compat/compatlogger.cpp
+++ b/lib/compat/compatlogger.cpp
@@ -44,7 +44,7 @@ REGISTER_SCRIPTFUNCTION(ValidateRotationMethod, &CompatLogger::ValidateRotationM
 
 REGISTER_STATSFUNCTION(CompatLoggerStats, &CompatLogger::StatsFunc);
 
-Value CompatLogger::StatsFunc(const Dictionary::Ptr& status, const Array::Ptr&)
+void CompatLogger::StatsFunc(const Dictionary::Ptr& status, const Array::Ptr&)
 {
        Dictionary::Ptr nodes = new Dictionary();
 
@@ -53,8 +53,6 @@ Value CompatLogger::StatsFunc(const Dictionary::Ptr& status, const Array::Ptr&)
        }
 
        status->Set("compatlogger", nodes);
-
-       return 0;
 }
 
 /**

diff --git a/lib/compat/compatlogger.hpp b/lib/compat/compatlogger.hpp
index 7bc9f6287a503421af08f611e5adb5404af1ccb6..24ae233c287848b5defe86c38572608e3a69aa61 100644 (file)
--- a/lib/compat/compatlogger.hpp
+++ b/lib/compat/compatlogger.hpp
@@ -39,7 +39,7 @@ public:
        DECLARE_OBJECT(CompatLogger);
        DECLARE_OBJECTNAME(CompatLogger);
 
-       static Value StatsFunc(const Dictionary::Ptr& status, const Array::Ptr& perfdata);
+       static void StatsFunc(const Dictionary::Ptr& status, const Array::Ptr& perfdata);
 
        static void ValidateRotationMethod(const String& location, const CompatLogger::Ptr& object);
 

diff --git a/lib/compat/externalcommandlistener.cpp b/lib/compat/externalcommandlistener.cpp
index 14238479462d59a2adba3b9d26b925d3bbe24577..8522ede08a8b11a17a0627fa5e664f0fd5b9acc2 100644 (file)
--- a/lib/compat/externalcommandlistener.cpp
+++ b/lib/compat/externalcommandlistener.cpp
@@ -31,7 +31,7 @@ REGISTER_TYPE(ExternalCommandListener);
 
 REGISTER_STATSFUNCTION(ExternalCommandListenerStats, &ExternalCommandListener::StatsFunc);
 
-Value ExternalCommandListener::StatsFunc(const Dictionary::Ptr& status, const Array::Ptr&)
+void ExternalCommandListener::StatsFunc(const Dictionary::Ptr& status, const Array::Ptr&)
 {
        Dictionary::Ptr nodes = new Dictionary();
 
@@ -40,8 +40,6 @@ Value ExternalCommandListener::StatsFunc(const Dictionary::Ptr& status, const Ar
        }
 
        status->Set("externalcommandlistener", nodes);
-
-       return 0;
 }
 
 /**

diff --git a/lib/compat/externalcommandlistener.hpp b/lib/compat/externalcommandlistener.hpp
index 2448792ad4071862dce887c2ab3e758503536178..6e83eaf2388c9a7b812e0a63cefbce34139b5e7a 100644 (file)
--- a/lib/compat/externalcommandlistener.hpp
+++ b/lib/compat/externalcommandlistener.hpp
@@ -39,7 +39,7 @@ public:
        DECLARE_OBJECT(ExternalCommandListener);
        DECLARE_OBJECTNAME(ExternalCommandListener);
 
-       static Value StatsFunc(const Dictionary::Ptr& status, const Array::Ptr& perfdata);
+       static void StatsFunc(const Dictionary::Ptr& status, const Array::Ptr& perfdata);
 
 protected:
        virtual void Start(void);

diff --git a/lib/compat/statusdatawriter.cpp b/lib/compat/statusdatawriter.cpp
index 4fd5170e59a5dca24418e4490b2f3fcc7f4ead31..699f0b605ed33a24866125cff1eda0f63e694fd3 100644 (file)
--- a/lib/compat/statusdatawriter.cpp
+++ b/lib/compat/statusdatawriter.cpp
@@ -49,7 +49,7 @@ REGISTER_TYPE(StatusDataWriter);
 
 REGISTER_STATSFUNCTION(StatusDataWriterStats, &StatusDataWriter::StatsFunc);
 
-Value StatusDataWriter::StatsFunc(const Dictionary::Ptr& status, const Array::Ptr&)
+void StatusDataWriter::StatsFunc(const Dictionary::Ptr& status, const Array::Ptr&)
 {
        Dictionary::Ptr nodes = new Dictionary();
 
@@ -58,8 +58,6 @@ Value StatusDataWriter::StatsFunc(const Dictionary::Ptr& status, const Array::Pt
        }
 
        status->Set("statusdatawriter", nodes);
-
-       return 0;
 }
 
 /**

diff --git a/lib/compat/statusdatawriter.hpp b/lib/compat/statusdatawriter.hpp
index ac78562b4752668901bdad0031f3e66154adee7f..1e6b919eec602b518c1b2192477a84a50f1c2c94 100644 (file)
--- a/lib/compat/statusdatawriter.hpp
+++ b/lib/compat/statusdatawriter.hpp
@@ -44,7 +44,7 @@ public:
        DECLARE_OBJECT(StatusDataWriter);
        DECLARE_OBJECTNAME(StatusDataWriter);
 
-       static Value StatsFunc(const Dictionary::Ptr& status, const Array::Ptr& perfdata);
+       static void StatsFunc(const Dictionary::Ptr& status, const Array::Ptr& perfdata);
 
 protected:
        virtual void Start(void);

diff --git a/lib/db_ido_mysql/idomysqlconnection.cpp b/lib/db_ido_mysql/idomysqlconnection.cpp
index f94b6b65fe29e2d5c6eb2907245a2fb842687f6a..3e548f3b56e5a319c26a8dc9a570fda22e7c758c 100644 (file)
--- a/lib/db_ido_mysql/idomysqlconnection.cpp
+++ b/lib/db_ido_mysql/idomysqlconnection.cpp
@@ -43,7 +43,7 @@ IdoMysqlConnection::IdoMysqlConnection(void)
        : m_QueryQueue(500000), m_Connected(false)
 { }
 
-Value IdoMysqlConnection::StatsFunc(const Dictionary::Ptr& status, const Array::Ptr& perfdata)
+void IdoMysqlConnection::StatsFunc(const Dictionary::Ptr& status, const Array::Ptr& perfdata)
 {
        Dictionary::Ptr nodes = new Dictionary();
 
@@ -61,8 +61,6 @@ Value IdoMysqlConnection::StatsFunc(const Dictionary::Ptr& status, const Array::
        }
 
        status->Set("idomysqlconnection", nodes);
-
-       return 0;
 }
 
 void IdoMysqlConnection::Resume(void)

diff --git a/lib/db_ido_mysql/idomysqlconnection.hpp b/lib/db_ido_mysql/idomysqlconnection.hpp
index acbac6c518042630003810dcdaef196769b52253..474fbe464cc89e335ec53b2e87e144a32d3d689d 100644 (file)
--- a/lib/db_ido_mysql/idomysqlconnection.hpp
+++ b/lib/db_ido_mysql/idomysqlconnection.hpp
@@ -44,7 +44,7 @@ public:
 
        IdoMysqlConnection(void);
 
-       static Value StatsFunc(const Dictionary::Ptr& status, const Array::Ptr& perfdata);
+       static void StatsFunc(const Dictionary::Ptr& status, const Array::Ptr& perfdata);
 
 protected:
        virtual void Resume(void);

diff --git a/lib/db_ido_pgsql/idopgsqlconnection.cpp b/lib/db_ido_pgsql/idopgsqlconnection.cpp
index 1d74ebe32719168b540c55f29bcb50c65994f57a..5e9747a666127f2f9885989099cf06f2b6b4e630 100644 (file)
--- a/lib/db_ido_pgsql/idopgsqlconnection.cpp
+++ b/lib/db_ido_pgsql/idopgsqlconnection.cpp
@@ -45,7 +45,7 @@ IdoPgsqlConnection::IdoPgsqlConnection(void)
        : m_QueryQueue(500000), m_Connection(NULL)
 { }
 
-Value IdoPgsqlConnection::StatsFunc(const Dictionary::Ptr& status, const Array::Ptr& perfdata)
+void IdoPgsqlConnection::StatsFunc(const Dictionary::Ptr& status, const Array::Ptr& perfdata)
 {
        Dictionary::Ptr nodes = new Dictionary();
 
@@ -63,8 +63,6 @@ Value IdoPgsqlConnection::StatsFunc(const Dictionary::Ptr& status, const Array::
        }
 
        status->Set("idopgsqlconnection", nodes);
-
-       return 0;
 }
 
 void IdoPgsqlConnection::Resume(void)

diff --git a/lib/db_ido_pgsql/idopgsqlconnection.hpp b/lib/db_ido_pgsql/idopgsqlconnection.hpp
index 3b9a79eeab484eecd596230820d6fb2d394baaf6..4f7bf9d7d23a11e0a21747152a68861f6600dc9f 100644 (file)
--- a/lib/db_ido_pgsql/idopgsqlconnection.hpp
+++ b/lib/db_ido_pgsql/idopgsqlconnection.hpp
@@ -43,8 +43,8 @@ public:
        DECLARE_OBJECTNAME(IdoPgsqlConnection);
 
     IdoPgsqlConnection(void);
-    
-       static Value StatsFunc(const Dictionary::Ptr& status, const Array::Ptr& perfdata);
+
+       static void StatsFunc(const Dictionary::Ptr& status, const Array::Ptr& perfdata);
 
 protected:
        virtual void Resume(void);

diff --git a/lib/icinga/cib.cpp b/lib/icinga/cib.cpp
index f01b8e9b475c55266a7c49d1a47e8603bd1becf2..5b106d2bbf9da13e2c4dae4e23a048c6ee738d68 100644 (file)
--- a/lib/icinga/cib.cpp
+++ b/lib/icinga/cib.cpp
@@ -244,14 +244,13 @@ std::pair<Dictionary::Ptr, Array::Ptr> CIB::GetFeatureStats(void)
        Array::Ptr perfdata = new Array();
 
        String name;
-       Value ret;
        BOOST_FOREACH(tie(name, boost::tuples::ignore), StatsFunctionRegistry::GetInstance()->GetItems()) {
                StatsFunction::Ptr func = StatsFunctionRegistry::GetInstance()->GetItem(name);
 
                if (!func)
                        BOOST_THROW_EXCEPTION(std::invalid_argument("Function '" + name + "' does not exist."));
 
-               ret = func->Invoke(status, perfdata);
+               func->Invoke(status, perfdata);
        }
 
        return std::make_pair(status, perfdata);

diff --git a/lib/icinga/icingaapplication.cpp b/lib/icinga/icingaapplication.cpp
index ed1f075039be9e838dbbc307623a8d0c826d46cc..53eddc8f13b825ef03089440446835aac3e530d6 100644 (file)
--- a/lib/icinga/icingaapplication.cpp
+++ b/lib/icinga/icingaapplication.cpp
@@ -63,7 +63,7 @@ void IcingaApplication::StaticInitialize(void)
 
 REGISTER_STATSFUNCTION(IcingaApplicationStats, &IcingaApplication::StatsFunc);
 
-Value IcingaApplication::StatsFunc(Dictionary::Ptr& status, Array::Ptr& perfdata)
+void IcingaApplication::StatsFunc(Dictionary::Ptr& status, Array::Ptr& perfdata)
 {
        Dictionary::Ptr nodes = new Dictionary();
 
@@ -84,8 +84,6 @@ Value IcingaApplication::StatsFunc(Dictionary::Ptr& status, Array::Ptr& perfdata
        }
 
        status->Set("icingaapplication", nodes);
-
-       return 0;
 }
 
 /**

diff --git a/lib/icinga/icingaapplication.hpp b/lib/icinga/icingaapplication.hpp
index 0711ecb1025950fb9d059755091f55056605993e..2df3ecd3b9ddc22a4af4432fe201b9b9ef1624b3 100644 (file)
--- a/lib/icinga/icingaapplication.hpp
+++ b/lib/icinga/icingaapplication.hpp
@@ -42,7 +42,7 @@ public:
 
        int Main(void);
 
-       static Value StatsFunc(Dictionary::Ptr& status, Array::Ptr& perfdata);
+       static void StatsFunc(Dictionary::Ptr& status, Array::Ptr& perfdata);
 
        static IcingaApplication::Ptr GetInstance(void);
 

diff --git a/lib/icinga/icingastatuswriter.cpp b/lib/icinga/icingastatuswriter.cpp
index aad8640f3e7baa721d7295af0503c9b842fc88a3..f1df5fdd636a4ccaab4b78de28f78a9019047862 100644 (file)
--- a/lib/icinga/icingastatuswriter.cpp
+++ b/lib/icinga/icingastatuswriter.cpp
@@ -35,7 +35,7 @@ REGISTER_TYPE(IcingaStatusWriter);
 
 REGISTER_STATSFUNCTION(IcingaStatusWriterStats, &IcingaStatusWriter::StatsFunc);
 
-Value IcingaStatusWriter::StatsFunc(Dictionary::Ptr& status, Array::Ptr& perfdata)
+void IcingaStatusWriter::StatsFunc(Dictionary::Ptr& status, Array::Ptr& perfdata)
 {
        Dictionary::Ptr nodes = new Dictionary();
 
@@ -44,8 +44,6 @@ Value IcingaStatusWriter::StatsFunc(Dictionary::Ptr& status, Array::Ptr& perfdat
        }
 
        status->Set("icingastatuswriter", nodes);
-
-       return 0;
 }
 
 /**

diff --git a/lib/icinga/icingastatuswriter.hpp b/lib/icinga/icingastatuswriter.hpp
index 89ae84c66a4be530976ac6e11bd836b4f8795f21..3f2fe2d3eeaa843efd057f5845389cabd9049d52 100644 (file)
--- a/lib/icinga/icingastatuswriter.hpp
+++ b/lib/icinga/icingastatuswriter.hpp
@@ -35,7 +35,7 @@ public:
        DECLARE_OBJECT(IcingaStatusWriter);
        DECLARE_OBJECTNAME(IcingaStatusWriter);
 
-       static Value StatsFunc(Dictionary::Ptr& status, Array::Ptr& perfdata);
+       static void StatsFunc(Dictionary::Ptr& status, Array::Ptr& perfdata);
        static Dictionary::Ptr GetStatusData(void);
 
 protected:

diff --git a/lib/livestatus/livestatuslistener.cpp b/lib/livestatus/livestatuslistener.cpp
index f759bab228a4d2db8c60bca8bcf7d903190ce947..41894344fede949e020553f964ae2791af948ee4 100644 (file)
--- a/lib/livestatus/livestatuslistener.cpp
+++ b/lib/livestatus/livestatuslistener.cpp
@@ -43,7 +43,7 @@ static boost::mutex l_ComponentMutex;
 
 REGISTER_STATSFUNCTION(LivestatusListenerStats, &LivestatusListener::StatsFunc);
 
-Value LivestatusListener::StatsFunc(const Dictionary::Ptr& status, const Array::Ptr& perfdata)
+void LivestatusListener::StatsFunc(const Dictionary::Ptr& status, const Array::Ptr& perfdata)
 {
        Dictionary::Ptr nodes = new Dictionary();
 
@@ -57,8 +57,6 @@ Value LivestatusListener::StatsFunc(const Dictionary::Ptr& status, const Array::
        }
 
        status->Set("livestatuslistener", nodes);
-
-       return 0;
 }
 
 /**

diff --git a/lib/livestatus/livestatuslistener.hpp b/lib/livestatus/livestatuslistener.hpp
index b074c6cc5a4dd167d5976d9ccd69fbaa9686edcb..cc765a3c023817ef0e57ea86c330e5debb9dbe0f 100644 (file)
--- a/lib/livestatus/livestatuslistener.hpp
+++ b/lib/livestatus/livestatuslistener.hpp
@@ -39,7 +39,7 @@ public:
        DECLARE_OBJECT(LivestatusListener);
        DECLARE_OBJECTNAME(LivestatusListener);
 
-       static Value StatsFunc(const Dictionary::Ptr& status, const Array::Ptr& perfdata);
+       static void StatsFunc(const Dictionary::Ptr& status, const Array::Ptr& perfdata);
 
        static int GetClientsConnected(void);
        static int GetConnections(void);

diff --git a/lib/notification/notificationcomponent.cpp b/lib/notification/notificationcomponent.cpp
index 588c4af8c0d126f4d60741a98ca9734ec5a4689d..67357f1019d6f0bd49b7e1037e617046505f47a7 100644 (file)
--- a/lib/notification/notificationcomponent.cpp
+++ b/lib/notification/notificationcomponent.cpp
@@ -34,7 +34,7 @@ REGISTER_TYPE(NotificationComponent);
 
 REGISTER_STATSFUNCTION(NotificationComponentStats, &NotificationComponent::StatsFunc);
 
-Value NotificationComponent::StatsFunc(const Dictionary::Ptr& status, const Array::Ptr&)
+void NotificationComponent::StatsFunc(const Dictionary::Ptr& status, const Array::Ptr&)
 {
        Dictionary::Ptr nodes = new Dictionary();
 
@@ -43,8 +43,6 @@ Value NotificationComponent::StatsFunc(const Dictionary::Ptr& status, const Arra
        }
 
        status->Set("notificationcomponent", nodes);
-
-       return 0;
 }
 
 /**

diff --git a/lib/notification/notificationcomponent.hpp b/lib/notification/notificationcomponent.hpp
index 7955c0f585d67f9a75f6b3409860a2cb0fdb9828..e75f63fefaa8d75585e224b4d93118784b973ddb 100644 (file)
--- a/lib/notification/notificationcomponent.hpp
+++ b/lib/notification/notificationcomponent.hpp
@@ -37,7 +37,7 @@ public:
        DECLARE_OBJECT(NotificationComponent);
        DECLARE_OBJECTNAME(NotificationComponent);
 
-       static Value StatsFunc(const Dictionary::Ptr& status, const Array::Ptr& perfdata);
+       static void StatsFunc(const Dictionary::Ptr& status, const Array::Ptr& perfdata);
 
        virtual void Start(void);
 

diff --git a/lib/perfdata/gelfwriter.hpp b/lib/perfdata/gelfwriter.hpp
index f6ae7f4d04b0f9b093100e52c5a7000d0941748c..374010c1235d3f1d36b62a445581fb0c919b9615 100644 (file)
--- a/lib/perfdata/gelfwriter.hpp
+++ b/lib/perfdata/gelfwriter.hpp
@@ -46,16 +46,16 @@ protected:
 
 private:
        Stream::Ptr m_Stream;
-       
+
        Timer::Ptr m_ReconnectTimer;
 
        void CheckResultHandler(const Checkable::Ptr& checkable, const CheckResult::Ptr& cr);
-  void NotificationToUserHandler(const Notification::Ptr& notification, const Checkable::Ptr& checkable,
-    const User::Ptr& user, NotificationType notification_type, CheckResult::Ptr const& cr,
-    const String& author, const String& comment_text, const String& command_name);
-  String ComposeGelfMessage(const Dictionary::Ptr& fields, const String& source);
-  void StateChangeHandler(const Checkable::Ptr& checkable, const CheckResult::Ptr& cr, StateType type);
-  void SendLogMessage(const String& gelf);
+       void NotificationToUserHandler(const Notification::Ptr& notification, const Checkable::Ptr& checkable,
+           const User::Ptr& user, NotificationType notification_type, CheckResult::Ptr const& cr,
+           const String& author, const String& comment_text, const String& command_name);
+       String ComposeGelfMessage(const Dictionary::Ptr& fields, const String& source);
+       void StateChangeHandler(const Checkable::Ptr& checkable, const CheckResult::Ptr& cr, StateType type);
+       void SendLogMessage(const String& gelf);
 
        void ReconnectTimerHandler(void);
 };

diff --git a/lib/perfdata/graphitewriter.cpp b/lib/perfdata/graphitewriter.cpp
index 43b6389eb92f805b2d86ae569dbe6401025262dd..695344b124ea151ce5d09a68d6d9b423df84b81e 100644 (file)
--- a/lib/perfdata/graphitewriter.cpp
+++ b/lib/perfdata/graphitewriter.cpp
@@ -46,7 +46,7 @@ REGISTER_TYPE(GraphiteWriter);
 
 REGISTER_STATSFUNCTION(GraphiteWriterStats, &GraphiteWriter::StatsFunc);
 
-Value GraphiteWriter::StatsFunc(const Dictionary::Ptr& status, const Array::Ptr&)
+void GraphiteWriter::StatsFunc(const Dictionary::Ptr& status, const Array::Ptr&)
 {
        Dictionary::Ptr nodes = new Dictionary();
 
@@ -55,8 +55,6 @@ Value GraphiteWriter::StatsFunc(const Dictionary::Ptr& status, const Array::Ptr&
        }
 
        status->Set("graphitewriter", nodes);
-
-       return 0;
 }
 
 void GraphiteWriter::Start(void)

diff --git a/lib/perfdata/graphitewriter.hpp b/lib/perfdata/graphitewriter.hpp
index f2bc63482223e164aa71a8bf67feffe5f702ed3b..82a136be3b29c7dcf755be98c1eb3fcac6a9b9c4 100644 (file)
--- a/lib/perfdata/graphitewriter.hpp
+++ b/lib/perfdata/graphitewriter.hpp
@@ -41,14 +41,14 @@ public:
        DECLARE_OBJECT(GraphiteWriter);
        DECLARE_OBJECTNAME(GraphiteWriter);
 
-       static Value StatsFunc(const Dictionary::Ptr& status, const Array::Ptr& perfdata);
+       static void StatsFunc(const Dictionary::Ptr& status, const Array::Ptr& perfdata);
 
 protected:
        virtual void Start(void);
 
 private:
        Stream::Ptr m_Stream;
-       
+
        Timer::Ptr m_ReconnectTimer;
 
        void CheckResultHandler(const Checkable::Ptr& checkable, const CheckResult::Ptr& cr);

diff --git a/lib/perfdata/opentsdbwriter.cpp b/lib/perfdata/opentsdbwriter.cpp
index 543116d4b40c630bb680a7c32e84d4de65d991c7..20248af955b6dacec384ef58be9a5f5cea7318d5 100644 (file)
--- a/lib/perfdata/opentsdbwriter.cpp
+++ b/lib/perfdata/opentsdbwriter.cpp
@@ -46,7 +46,7 @@ REGISTER_TYPE(OpenTsdbWriter);
 
 REGISTER_STATSFUNCTION(OpenTsdbWriterStats, &OpenTsdbWriter::StatsFunc);
 
-Value OpenTsdbWriter::StatsFunc(const Dictionary::Ptr& status, const Array::Ptr&)
+void OpenTsdbWriter::StatsFunc(const Dictionary::Ptr& status, const Array::Ptr&)
 {
        Dictionary::Ptr nodes = new Dictionary();
 
@@ -55,8 +55,6 @@ Value OpenTsdbWriter::StatsFunc(const Dictionary::Ptr& status, const Array::Ptr&
        }
 
        status->Set("opentsdbwriter", nodes);
-
-       return 0;
 }
 
 void OpenTsdbWriter::Start(void)

diff --git a/lib/perfdata/opentsdbwriter.hpp b/lib/perfdata/opentsdbwriter.hpp
index 1f6ada102f7a979213257b79eab50c22d4a5d510..4aa3afff89071a2949377feb437f597dc8068846 100644 (file)
--- a/lib/perfdata/opentsdbwriter.hpp
+++ b/lib/perfdata/opentsdbwriter.hpp
@@ -41,14 +41,14 @@ public:
        DECLARE_OBJECT(OpenTsdbWriter);
        DECLARE_OBJECTNAME(OpenTsdbWriter);
 
-       static Value StatsFunc(const Dictionary::Ptr& status, const Array::Ptr& perfdata);
+       static void StatsFunc(const Dictionary::Ptr& status, const Array::Ptr& perfdata);
 
 protected:
        virtual void Start(void);
 
 private:
        Stream::Ptr m_Stream;
-       
+
        Timer::Ptr m_ReconnectTimer;
 
        void CheckResultHandler(const Checkable::Ptr& checkable, const CheckResult::Ptr& cr);

diff --git a/lib/perfdata/perfdatawriter.cpp b/lib/perfdata/perfdatawriter.cpp
index f6b276b487e1ff1cea6e9a38eb35a841ae173cee..5f2d625db5fb252b59f023021f142ee52ba4e3c9 100644 (file)
--- a/lib/perfdata/perfdatawriter.cpp
+++ b/lib/perfdata/perfdatawriter.cpp
@@ -36,7 +36,7 @@ REGISTER_TYPE(PerfdataWriter);
 
 REGISTER_STATSFUNCTION(PerfdataWriterStats, &PerfdataWriter::StatsFunc);
 
-Value PerfdataWriter::StatsFunc(const Dictionary::Ptr& status, const Array::Ptr&)
+void PerfdataWriter::StatsFunc(const Dictionary::Ptr& status, const Array::Ptr&)
 {
        Dictionary::Ptr nodes = new Dictionary();
 
@@ -45,8 +45,6 @@ Value PerfdataWriter::StatsFunc(const Dictionary::Ptr& status, const Array::Ptr&
        }
 
        status->Set("perfdatawriter", nodes);
-
-       return 0;
 }
 
 void PerfdataWriter::Start(void)

diff --git a/lib/perfdata/perfdatawriter.hpp b/lib/perfdata/perfdatawriter.hpp
index 246c6ff7002dfb24bed02af18dfd34510fe2758d..b0ced37281ee85a0e18cb6f9cef37b796a516046 100644 (file)
--- a/lib/perfdata/perfdatawriter.hpp
+++ b/lib/perfdata/perfdatawriter.hpp
@@ -40,7 +40,7 @@ public:
        DECLARE_OBJECT(PerfdataWriter);
        DECLARE_OBJECTNAME(PerfdataWriter);
 
-       static Value StatsFunc(const Dictionary::Ptr& status, const Array::Ptr& perfdata);
+       static void StatsFunc(const Dictionary::Ptr& status, const Array::Ptr& perfdata);
 
 protected:
        virtual void Start(void);

diff --git a/lib/remote/apilistener.cpp b/lib/remote/apilistener.cpp
index 15ef5275c1d9decd99e41d57fbed3a33050febd8..9c962dc64afbdd5cca1db6c2d37916c65324b088 100644 (file)
--- a/lib/remote/apilistener.cpp
+++ b/lib/remote/apilistener.cpp
@@ -747,7 +747,7 @@ void ApiListener::ReplayLog(const ApiClient::Ptr& client)
        }
 }
 
-Value ApiListener::StatsFunc(Dictionary::Ptr& status, Array::Ptr& perfdata)
+void ApiListener::StatsFunc(Dictionary::Ptr& status, Array::Ptr& perfdata)
 {
        Dictionary::Ptr nodes = new Dictionary();
        std::pair<Dictionary::Ptr, Dictionary::Ptr> stats;
@@ -755,7 +755,7 @@ Value ApiListener::StatsFunc(Dictionary::Ptr& status, Array::Ptr& perfdata)
        ApiListener::Ptr listener = ApiListener::GetInstance();
 
        if (!listener)
-               return 0;
+               return;
 
        stats = listener->GetStatus();
 
@@ -764,8 +764,6 @@ Value ApiListener::StatsFunc(Dictionary::Ptr& status, Array::Ptr& perfdata)
                perfdata->Add("'api_" + kv.first + "'=" + Convert::ToString(kv.second));
 
        status->Set("api", stats.first);
-
-       return 0;
 }
 
 std::pair<Dictionary::Ptr, Dictionary::Ptr> ApiListener::GetStatus(void)

diff --git a/lib/remote/apilistener.hpp b/lib/remote/apilistener.hpp
index 49d61d88e53a4efdb17c9638595bd9c9e29b3c39..884c1b034635e0ada1c172ed56f337afafc59980 100644 (file)
--- a/lib/remote/apilistener.hpp
+++ b/lib/remote/apilistener.hpp
@@ -59,7 +59,7 @@ public:
        void SyncSendMessage(const Endpoint::Ptr& endpoint, const Dictionary::Ptr& message);
        void RelayMessage(const MessageOrigin& origin, const DynamicObject::Ptr& secobj, const Dictionary::Ptr& message, bool log);
 
-       static Value StatsFunc(Dictionary::Ptr& status, Array::Ptr& perfdata);
+       static void StatsFunc(Dictionary::Ptr& status, Array::Ptr& perfdata);
        std::pair<Dictionary::Ptr, Dictionary::Ptr> GetStatus(void);
 
        void AddAnonymousClient(const ApiClient::Ptr& aclient);