X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_httpd_stats.cpp;h=6bf5dc86840391c8e2630df8edad2251298aea80;hb=78fa4165c90088523e623ab2b64ca0db0d19def0;hp=ac49fccf8b33996a162beefc346005f7e9b7a004;hpb=38ca8be9a3881a3cb3cf6864e67b779ffbab6874;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_httpd_stats.cpp b/src/modules/m_httpd_stats.cpp index ac49fccf8..6bf5dc868 100644 --- a/src/modules/m_httpd_stats.cpp +++ b/src/modules/m_httpd_stats.cpp @@ -6,21 +6,21 @@ * See: http://www.inspircd.org/wiki/index.php/Credits * * This program is free but copyrighted software; see - * the file COPYING for details. + * the file COPYING for details. * * --------------------------------------------------- */ -#include +#include "inspircd.h" #include "users.h" #include "channels.h" #include "configreader.h" #include "modules.h" #include "inspsocket.h" #include "httpd.h" -#include "inspircd.h" /* $ModDesc: Provides statistics over HTTP via m_httpd.so */ +/* $ModDep: httpd.h */ typedef std::map StatsHash; typedef StatsHash::iterator StatsIter; @@ -31,6 +31,8 @@ typedef SortedList::iterator SortedIter; static StatsHash* sh = new StatsHash(); static SortedList* so = new SortedList(); +static StatsHash* Servers = new StatsHash(); + class ModuleHttpStats : public Module { @@ -45,11 +47,10 @@ class ModuleHttpStats : public Module this->stylesheet = c.ReadValue("httpstats", "stylesheet", 0); } - ModuleHttpStats(InspIRCd* Me) : Module::Module(Me) + ModuleHttpStats(InspIRCd* Me) : Module(Me) { - ReadConfig(); - this->changed = false; + this->changed = true; } void InsertOrder(irc::string channel, int count) @@ -75,6 +76,18 @@ class ModuleHttpStats : public Module so->clear(); for (StatsIter a = sh->begin(); a != sh->end(); a++) InsertOrder(a->first, a->second); + for (user_hash::iterator u = ServerInstance->clientlist->begin(); u != ServerInstance->clientlist->end(); u++) + { + StatsHash::iterator n = Servers->find(u->second->server); + if (n != Servers->end()) + { + n->second++; + } + else + { + Servers->insert(std::make_pair(u->second->server,1)); + } + } this->changed = false; } @@ -88,80 +101,80 @@ class ModuleHttpStats : public Module if ((http->GetURI() == "/stats") || (http->GetURI() == "/stats/")) { - data << "\n\ - "; - - data << ""; - data << ""; - data << "InspIRCd server statisitics for " << ServerInstance->Config->ServerName << " (" << ServerInstance->Config->ServerDesc << ")"; - data << ""; - data << "

InspIRCd server statisitics for " << ServerInstance->Config->ServerName << " (" << ServerInstance->Config->ServerDesc << ")

"; - - data << "
"; - data << "

Totals

"; - data << ""; - data << ""; - data << ""; - data << ""; - data << ""; - data << "
Users" << ServerInstance->clientlist->size() << "
Channels" << ServerInstance->chanlist->size() << "
Opers" << ServerInstance->all_opers.size() << "
Sockets" << (ServerInstance->SE->GetMaxFds() - ServerInstance->SE->GetRemainingFds()) << " (Max: " << ServerInstance->SE->GetMaxFds() << " via socket engine '" << ServerInstance->SE->GetName() << "')
"; - data << "
"; - - data << "
"; - data << "

Modules

"; - data << ""; + data << ""; + + data << "" << ServerInstance->Config->ServerName << "" << ServerInstance->Config->ServerDesc << ""; + + data << ""; + data << "" << ServerInstance->clientlist->size() << ""; + data << "" << ServerInstance->chanlist->size() << ""; + data << "" << ServerInstance->all_opers.size() << ""; + data << "" << (ServerInstance->SE->GetMaxFds() - ServerInstance->SE->GetRemainingFds()) << "" << ServerInstance->SE->GetMaxFds() << + "" << ServerInstance->SE->GetName() << ""; + + time_t current_time = 0; + current_time = ServerInstance->Time(); + time_t server_uptime = current_time - ServerInstance->startup_time; + struct tm* stime; + stime = gmtime(&server_uptime); + data << "" << stime->tm_yday << "" << stime->tm_hour << "" << stime->tm_min << "" << stime->tm_sec << ""; + + + data << ""; + data << ""; for (int i = 0; i <= ServerInstance->GetModuleCount(); i++) { - if (ServerInstance->Config->module_names[i] != "") - data << ""; + if (!ServerInstance->Config->module_names[i].empty()) + { + Version v = ServerInstance->modules[i]->GetVersion(); + data << "" << ServerInstance->Config->module_names[i] << "" << + v.Major << "." << v.Minor << "." << v.Revision << "." << v.Build << ""; + } } - data << "
" << ServerInstance->Config->module_names[i] << "
"; - data << "
"; - - data << "
"; - data << "

Channels

"; - data << ""; - data << ""; + data << ""; + data << ""; /* If the list has changed since last time it was displayed, re-sort it * this time only (not every time, as this would be moronic) */ if (this->changed) this->SortList(); - int n = 0; - for (SortedIter a = so->begin(); ((a != so->end()) && (n < 25)); a++, n++) + for (SortedIter a = so->begin(); a != so->end(); a++) { chanrec* c = ServerInstance->FindChan(a->second.c_str()); - if (c) + if (c && !c->IsModeSet('s') && !c->IsModeSet('p')) { - data << ""; - data << ""; - data << ""; - data << ""; - data << ""; - data << ""; + data << ""; + data << "" << c->GetUsers()->size() << "" << c->name << ""; + data << "" << c->GetOppedUsers()->size() << ""; + data << "" << c->GetHalfoppedUsers()->size() << ""; + data << "" << c->GetVoicedUsers()->size() << ""; + data << "" << c->topic << ""; + data << "" << c->ChanModes(false) << ""; + data << ""; } } - data << "
UsersName@%+Topic
" << a->first << "" << a->second << "" << c->GetOppedUsers()->size() << "" << c->GetHalfoppedUsers()->size() << "" << c->GetVoicedUsers()->size() << "" << c->topic << "
"; - data << "
"; - - + data << ""; - - - data << "
"; - data << "

Valid XHTML 1.1

"; - data << "
"; + data << ""; - data << ""; - data << ""; + for (StatsHash::iterator b = Servers->begin(); b != Servers->end(); b++) + { + data << ""; + data << "" << b->first << ""; + data << "" << b->second << ""; + data << ""; + } + data << ""; + + data << ""; /* Send the document back to m_httpd */ - HTTPDocument response(http->sock, &data, 200, "X-Powered-By: m_http_stats.so\r\nContent-Type: text/html; charset=iso-8859-1\r\n"); + HTTPDocument response(http->sock, &data, 200); + response.headers.SetHeader("X-Powered-By", "m_httpd_stats.so"); + response.headers.SetHeader("Content-Type", "text/xml"); Request req((char*)&response, (Module*)this, event->GetSource()); req.Send(); } @@ -178,7 +191,7 @@ class ModuleHttpStats : public Module this->changed = true; } - void OnUserJoin(userrec* user, chanrec* channel) + void OnUserJoin(userrec* user, chanrec* channel, bool &silent) { StatsIter a = sh->find(channel->name); if (a != sh->end()) @@ -193,7 +206,7 @@ class ModuleHttpStats : public Module this->changed = true; } - void OnUserPart(userrec* user, chanrec* channel, const std::string &partmessage) + void OnUserPart(userrec* user, chanrec* channel, const std::string &partmessage, bool &silent) { StatsIter a = sh->find(channel->name); if (a != sh->end()) @@ -239,26 +252,4 @@ class ModuleHttpStats : public Module } }; - -class ModuleHttpStatsFactory : public ModuleFactory -{ - public: - ModuleHttpStatsFactory() - { - } - - ~ModuleHttpStatsFactory() - { - } - - virtual Module * CreateModule(InspIRCd* Me) - { - return new ModuleHttpStats(Me); - } -}; - - -extern "C" void * init_module( void ) -{ - return new ModuleHttpStatsFactory; -} +MODULE_INIT(ModuleHttpStats)