]> git.netwichtig.de Git - user/henk/code/inspircd.git/blobdiff - src/modules/m_httpd_stats.cpp
Add call to protocol interface to get useful info on the server map. Return a std...
[user/henk/code/inspircd.git] / src / modules / m_httpd_stats.cpp
index fb5499c2d5a19df0e019af72b734de5ccfad3eef..aa64dc3eabc63783a30a82f9cf38f91632bacae7 100644 (file)
@@ -2,30 +2,21 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- *                    E-mail:
- *             <brain@chatspike.net>
- *               <Craig@chatspike.net>
- *     
- * 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 <stdio.h>
-#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<irc::string,int> 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 << "<!DOCTYPE html PUBLIC \
-                                       \"-//W3C//DTD XHTML 1.1//EN\" \
-                                       \"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd\">\n\
-                                       <html xmlns=\"http://www.w3.org/1999/xhtml\" xml:lang=\"en\">";
-
-                               data << "<head>";
-                               data << "<link rel='stylesheet' href='" << this->stylesheet << "' type='text/css' />";
-                               data << "<title>InspIRCd server statisitics for " << ServerInstance->Config->ServerName << " (" << ServerInstance->Config->ServerDesc << ")</title>";
-                               data << "</head><body>";
-                               data << "<h1>InspIRCd server statisitics for " << ServerInstance->Config->ServerName << " (" << ServerInstance->Config->ServerDesc << ")</h1>";
-
-                               data << "<div class='totals'>";
-                               data << "<h2>Totals</h2>";
-                               data << "<table>";
-                               data << "<tr><td>Users</td><td>" << ServerInstance->clientlist.size() << "</td></tr>";
-                               data << "<tr><td>Channels</td><td>" << ServerInstance->chanlist.size() << "</td></tr>";
-                               data << "<tr><td>Opers</td><td>" << ServerInstance->all_opers.size() << "</td></tr>";
-                               data << "<tr><td>Sockets</td><td>" << (ServerInstance->SE->GetMaxFds() - ServerInstance->SE->GetRemainingFds()) << " (Max: " << ServerInstance->SE->GetMaxFds() << " via socket engine '" << ServerInstance->SE->GetName() << "')</td></tr>";
-                               data << "</table>";
-                               data << "</div>";
-
-                               data << "<div class='modules'>";
-                               data << "<h2>Modules</h2>";
-                               data << "<table>";
-                               for (int i = 0; i <= ServerInstance->GetModuleCount(); i++)
+                               data << "<inspircdstats>";
+
+                               data << "<server><name>" << ServerInstance->Config->ServerName << "</name><gecos>" << ServerInstance->Config->ServerDesc << "</gecos></server>";
+
+                               data << "<general>";
+                               data << "<usercount>" << ServerInstance->Users->clientlist->size() << "</usercount>";
+                               data << "<channelcount>" << ServerInstance->chanlist->size() << "</channelcount>";
+                               data << "<opercount>" << ServerInstance->Users->all_opers.size() << "</opercount>";
+                               data << "<socketcount>" << (ServerInstance->SE->GetMaxFds() - ServerInstance->SE->GetRemainingFds()) << "</socketcount><socketmax>" << ServerInstance->SE->GetMaxFds() <<
+                                       "</socketmax><socketengine>" << ServerInstance->SE->GetName() << "</socketengine>";
+
+                               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 << "<uptime><days>" << stime->tm_yday << "</days><hours>" << stime->tm_hour << "</hours><mins>" << stime->tm_min << "</mins><secs>" << stime->tm_sec << "</secs></uptime>";
+
+
+                               data << "</general>";
+                               data << "<modulelist>";
+                               std::vector<std::string> module_names = ServerInstance->Modules->GetAllModuleNames(0);
+                               for (std::vector<std::string>::iterator i = module_names.begin(); i != module_names.end(); ++i)
                                {
-                                       if (ServerInstance->Config->module_names[i] != "")
-                                               data << "<tr><td>" << ServerInstance->Config->module_names[i] << "</td></tr>";
+                                       Module* m = ServerInstance->Modules->Find(i->c_str());
+                                       Version v = m->GetVersion();
+                                       data << "<module><name>" << *i << "</name><version>" << v.Major << "." <<  v.Minor << "." << v.Revision << "." << v.Build << "</version></module>";
                                }
-                               data << "</table>";
-                               data << "</div>";
-
-                               data << "<div class='channels'>";
-                               data << "<h2>Channels</h2>";
-                               data << "<table>";
-                               data << "<tr><th>Users</th><th>Name</th><th>@</th><th>%</th><th>+</th><th>Topic</th></tr>";
+                               data << "</modulelist>";
 
+                               data << "<channellist>";
                                /* 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 << "<tr><td>" << a->first << "</td><td>" << a->second << "</td>";
-                                               data << "<td>" << c->GetOppedUsers()->size() << "</td>";
-                                               data << "<td>" << c->GetHalfoppedUsers()->size() << "</td>";
-                                               data << "<td>" << c->GetVoicedUsers()->size() << "</td>";
-                                               data << "<td>" << c->topic << "</td>";
-                                               data << "</tr>";
+                                               data << "<channel>";
+                                               data << "<usercount>" << c->GetUsers()->size() << "</usercount><channelname>" << c->name << "</channelname>";
+                                               data << "<channelops>" << c->GetOppedUsers()->size() << "</channelops>";
+                                               data << "<channelhalfops>" << c->GetHalfoppedUsers()->size() << "</channelhalfops>";
+                                               data << "<channelvoices>" << c->GetVoicedUsers()->size() << "</channelvoices>";
+                                               data << "<channeltopic>" << c->topic << "</channeltopic>";
+                                               data << "<channelmodes>" << c->ChanModes(false) << "</channelmodes>";
+                                               data << "</channel>";
                                        }
                                }
 
-                               data << "</table>";
-                               data << "</div>";
-
-
+                               data << "</channellist>";
 
+                               data << "<serverlist>";
+                               
+                               ProtoServerList sl;
+                               ServerInstance->PI->GetServerList(sl);
 
+                               for (ProtoServerList::iterator b = sl.begin(); b != sl.end(); ++b)
+                               {
+                                       data << "<server>";
+                                       data << "<servername>" << b->servername << "</servername>";
+                                       data << "<parentname>" << b->parentname << "</parentname>";
+                                       data << "<usercount>" << b->usercount << "</usercount>";
+                                       data << "<opercount>" << b->opercount << "</opercount>";
+                                       data << "<lagmillisecs>" << b->latencyms << "</lagmillisecs>";
+                                       data << "</server>";
+                               }
+                               data << "</serverlist>";
 
-                               data << "<div class='validion'>";
-                               data << "<p><a href='http://validator.w3.org/check?uri=referer'><img src='http://www.w3.org/Icons/valid-xhtml11' alt='Valid XHTML 1.1' height='31' width='88' /></a></p>";
-                               data << "</div>";
-                               
-                               data << "</body>";
-                               data << "</html>";
+                               data << "</inspircdstats>";
 
                                /* 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)