diff --git a/src/statsresponder.cpp b/src/statsresponder.cpp index 802a1bbdaf1aecedce579e0b7cde58472b37cac3..4ba24e71e20e32610c670047db6f4514a2416b23 100644 --- a/src/statsresponder.cpp +++ b/src/statsresponder.cpp @@ -34,16 +34,14 @@ #include "transport/rostermanager.h" #include "transport/usermanager.h" #include "transport/networkpluginserver.h" -#include "log4cxx/logger.h" - -using namespace log4cxx; +#include "transport/logging.h" using namespace Swift; using namespace boost; namespace Transport { -static LoggerPtr logger = Logger::getLogger("StatsResponder"); +DEFINE_LOGGER(logger, "StatsResponder"); StatsResponder::StatsResponder(Component *component, UserManager *userManager, NetworkPluginServer *server, StorageBackend *storageBackend) : Swift::Responder(component->getIQRouter()) { m_component = component; @@ -81,7 +79,10 @@ bool StatsResponder::handleGetRequest(const Swift::JID& from, const Swift::JID& response->addItem(StatsPayload::Item("users/online")); response->addItem(StatsPayload::Item("contacts/online")); response->addItem(StatsPayload::Item("contacts/total")); - response->addItem(StatsPayload::Item("backends")); + response->addItem(StatsPayload::Item("messages/from-xmpp")); + response->addItem(StatsPayload::Item("messages/to-xmpp")); + response->addItem(StatsPayload::Item("backends/running")); + response->addItem(StatsPayload::Item("backends/crashed")); response->addItem(StatsPayload::Item("memory-usage")); } else { @@ -115,8 +116,11 @@ bool StatsResponder::handleGetRequest(const Swift::JID& from, const Swift::JID& else if (item.getName() == "users/online") { response->addItem(StatsPayload::Item("users/online", "users", boost::lexical_cast(m_userManager->getUserCount()))); } - else if (item.getName() == "backends") { - response->addItem(StatsPayload::Item("backends", "backends", boost::lexical_cast(m_server->getBackendCount()))); + else if (item.getName() == "backends/running") { + response->addItem(StatsPayload::Item("backends/running", "backends", boost::lexical_cast(m_server->getBackendCount()))); + } + else if (item.getName() == "backends/crashed") { + response->addItem(StatsPayload::Item("backends/crashed", "backends", boost::lexical_cast(m_server->getCrashedBackends().size()))); } else if (item.getName() == "memory-usage") { response->addItem(StatsPayload::Item("memory-usage", "KB", boost::lexical_cast(usedMemory()))); @@ -127,6 +131,12 @@ bool StatsResponder::handleGetRequest(const Swift::JID& from, const Swift::JID& else if (item.getName() == "contacts/total") { response->addItem(StatsPayload::Item("contacts/total", "contacts", boost::lexical_cast(contactsTotal))); } + else if (item.getName() == "messages/from-xmpp") { + response->addItem(StatsPayload::Item("messages/from-xmpp", "messages", boost::lexical_cast(m_userManager->getMessagesToBackend()))); + } + else if (item.getName() == "messages/to-xmpp") { + response->addItem(StatsPayload::Item("messages/to-xmpp", "messages", boost::lexical_cast(m_userManager->getMessagesToXMPP()))); + } } }