X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_httpd_stats.cpp;h=aa64dc3eabc63783a30a82f9cf38f91632bacae7;hb=99a1ea0892b575c6d66d9f4c0aab5042c261ce4a;hp=fb5499c2d5a19df0e019af72b734de5ccfad3eef;hpb=a78cecbeb9c677bdd4b2f44c01195759af63485b;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_httpd_stats.cpp b/src/modules/m_httpd_stats.cpp index fb5499c2d..aa64dc3ea 100644 --- a/src/modules/m_httpd_stats.cpp +++ b/src/modules/m_httpd_stats.cpp @@ -2,30 +2,21 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev. - * E-mail: - * - * - * - * Written by Craig Edwards, Craig McLure, and others. + * InspIRCd: (C) 2002-2008 InspIRCd Development Team + * See: http://www.inspircd.org/wiki/index.php/Credits + * * This program is free but copyrighted software; see * the file COPYING for details. * * --------------------------------------------------- */ -using namespace std; - -#include -#include "users.h" -#include "channels.h" -#include "configreader.h" -#include "modules.h" -#include "inspsocket.h" -#include "httpd.h" #include "inspircd.h" +#include "httpd.h" +#include "protocol.h" /* $ModDesc: Provides statistics over HTTP via m_httpd.so */ +/* $ModDep: httpd.h */ typedef std::map StatsHash; typedef StatsHash::iterator StatsIter; @@ -50,11 +41,12 @@ 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; + Implementation eventlist[] = { I_OnEvent, I_OnRequest, I_OnChannelDelete, I_OnUserJoin, I_OnUserPart, I_OnUserQuit }; + ServerInstance->Modules->Attach(eventlist, this, 6); } void InsertOrder(irc::string channel, int count) @@ -89,93 +81,96 @@ class ModuleHttpStats : public Module if (event->GetEventID() == "httpd_url") { + ServerInstance->Logs->Log("m_http_stats", DEBUG,"Handling httpd event"); HTTPRequest* http = (HTTPRequest*)event->GetData(); 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 << ""; - for (int i = 0; i <= ServerInstance->GetModuleCount(); i++) + data << ""; + + data << "" << ServerInstance->Config->ServerName << "" << ServerInstance->Config->ServerDesc << ""; + + data << ""; + data << "" << ServerInstance->Users->clientlist->size() << ""; + data << "" << ServerInstance->chanlist->size() << ""; + data << "" << ServerInstance->Users->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 << ""; + std::vector module_names = ServerInstance->Modules->GetAllModuleNames(0); + for (std::vector::iterator i = module_names.begin(); i != module_names.end(); ++i) { - if (ServerInstance->Config->module_names[i] != "") - data << ""; + Module* m = ServerInstance->Modules->Find(i->c_str()); + Version v = m->GetVersion(); + data << "" << *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) + Channel* c = ServerInstance->FindChan(a->second.c_str()); + 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 << ""; + + ProtoServerList sl; + ServerInstance->PI->GetServerList(sl); + for (ProtoServerList::iterator b = sl.begin(); b != sl.end(); ++b) + { + data << ""; + data << "" << b->servername << ""; + data << "" << b->parentname << ""; + data << "" << b->usercount << ""; + data << "" << b->opercount << ""; + data << "" << b->latencyms << ""; + data << ""; + } + data << ""; - data << "
"; - data << "

Valid XHTML 1.1

"; - data << "
"; - - 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(); - - ServerInstance->Log(DEBUG,"Sent"); } } } - void OnChannelDelete(chanrec* chan) + void OnChannelDelete(Channel* chan) { StatsIter a = sh->find(chan->name); if (a != sh->end()) @@ -185,7 +180,7 @@ class ModuleHttpStats : public Module this->changed = true; } - void OnUserJoin(userrec* user, chanrec* channel) + void OnUserJoin(User* user, Channel* channel, bool sync, bool &silent) { StatsIter a = sh->find(channel->name); if (a != sh->end()) @@ -200,7 +195,7 @@ class ModuleHttpStats : public Module this->changed = true; } - void OnUserPart(userrec* user, chanrec* channel, const std::string &partmessage) + void OnUserPart(User* user, Channel* channel, const std::string &partmessage, bool &silent) { StatsIter a = sh->find(channel->name); if (a != sh->end()) @@ -210,11 +205,11 @@ class ModuleHttpStats : public Module this->changed = true; } - void OnUserQuit(userrec* user, const std::string &message) + void OnUserQuit(User* user, const std::string &message, const std::string &oper_message) { for (UCListIter v = user->chans.begin(); v != user->chans.end(); v++) { - chanrec* c = v->first; + Channel* c = v->first; StatsIter a = sh->find(c->name); if (a != sh->end()) { @@ -224,15 +219,11 @@ class ModuleHttpStats : public Module this->changed = true; } - char* OnRequest(Request* request) + const char* OnRequest(Request* request) { return NULL; } - void Implements(char* List) - { - List[I_OnEvent] = List[I_OnRequest] = List[I_OnChannelDelete] = List[I_OnUserJoin] = List[I_OnUserPart] = List[I_OnUserQuit] = 1; - } virtual ~ModuleHttpStats() { @@ -242,30 +233,8 @@ class ModuleHttpStats : public Module virtual Version GetVersion() { - return Version(1, 1, 0, 0, VF_VENDOR, API_VERSION); - } -}; - - -class ModuleHttpStatsFactory : public ModuleFactory -{ - public: - ModuleHttpStatsFactory() - { - } - - ~ModuleHttpStatsFactory() - { - } - - virtual Module * CreateModule(InspIRCd* Me) - { - return new ModuleHttpStats(Me); + return Version(1, 2, 0, 0, VF_VENDOR, API_VERSION); } }; - -extern "C" void * init_module( void ) -{ - return new ModuleHttpStatsFactory; -} +MODULE_INIT(ModuleHttpStats)