Change of configure message to plainer english as requested by voidzero

[user/henk/code/inspircd.git] / src / inspircd.cpp

diff --git a/src/inspircd.cpp b/src/inspircd.cpp
index aab09d7991e19b22b5d26b403984f2ca1a2a4ed8..9748e9472761109e80f5acd412f782c2b2ed3e15 100644 (file)
--- a/src/inspircd.cpp
+++ b/src/inspircd.cpp
@@ -38,6 +38,7 @@
 #include "command_parse.h"
 #include "exitcodes.h"
 #include "caller.h"
+#include "testsuite.h"
 
 using irc::sockets::insp_ntoa;
 using irc::sockets::insp_inaddr;
@@ -289,7 +290,8 @@ InspIRCd::InspIRCd(int argc, char** argv)
 
        int found_ports = 0;
        FailedPortList pl;
-       int do_version = 0, do_nofork = 0, do_debug = 0, do_nolog = 0, do_root = 0;    /* flag variables */
+       int do_version = 0, do_nofork = 0, do_debug = 0,
+           do_nolog = 0, do_root = 0, do_testsuite = 0;    /* flag variables */
        char c = 0;
 
        memset(&server, 0, sizeof(server));
@@ -352,6 +354,7 @@ InspIRCd::InspIRCd(int argc, char** argv)
                { "nolog",      no_argument,            &do_nolog,      1       },
                { "runasroot",  no_argument,            &do_root,       1       },
                { "version",    no_argument,            &do_version,    1       },
+               { "testsuite",  no_argument,            &do_testsuite,  1       },
                { 0, 0, 0, 0 }
        };
 
@@ -372,12 +375,16 @@ InspIRCd::InspIRCd(int argc, char** argv)
                        break;
                        default:
                                /* Unknown parameter! DANGER, INTRUDER.... err.... yeah. */
-                               printf("Usage: %s [--nofork] [--nolog] [--debug] [--logfile <filename>] [--runasroot] [--version] [--config <config>]\n", argv[0]);
+                               printf("Usage: %s [--nofork] [--nolog] [--debug] [--logfile <filename>]\n\
+                                                 [--runasroot] [--version] [--config <config>] [--testsuite]\n", argv[0]);
                                Exit(EXIT_STATUS_ARGV);
                        break;
                }
        }
 
+       if (do_testsuite)
+               do_nofork = do_debug = true;
+
        if (do_version)
        {
                printf("\n%s r%s\n", VERSION, REVISION);
@@ -401,6 +408,12 @@ InspIRCd::InspIRCd(int argc, char** argv)
 #endif
        strlcpy(Config->MyExecutable,argv[0],MAXBUF);
 
+       /* Set the finished argument values */
+       Config->nofork = do_nofork;
+       Config->forcedebug = do_debug;
+       Config->writelog = !do_nolog;
+       Config->TestSuite = do_testsuite;
+
        if (!this->OpenLog(argv, argc))
        {
                printf("ERROR: Could not open logfile %s: %s\n\n", Config->logpath.c_str(), strerror(errno));
@@ -421,10 +434,6 @@ InspIRCd::InspIRCd(int argc, char** argv)
        printf_c("\t\033[1;32mpippijn, peavey, aquanight, fez\033[0m\n\n");
        printf_c("Others:\t\t\t\033[1;32mSee /INFO Output\033[0m\n");
 
-       /* Set the finished argument values */
-       Config->nofork = do_nofork;
-       Config->forcedebug = do_debug;
-       Config->writelog = !do_nolog;   
        Config->ClearStack();
 
        this->Modes = new ModeParser(this);
@@ -458,7 +467,7 @@ InspIRCd::InspIRCd(int argc, char** argv)
                if (!this->DaemonSeed())
                {
                        printf("ERROR: could not go into daemon mode. Shutting down.\n");
-                       Log(DEFAULT,"ERROR: could not go into daemon mode. Shutting down.");
+                       Logs->Log("STARTUP", DEFAULT, "ERROR: could not go into daemon mode. Shutting down.");
                        Exit(EXIT_STATUS_FORK);
                }
        }
@@ -527,7 +536,7 @@ InspIRCd::InspIRCd(int argc, char** argv)
        if ((Config->ports.size() == 0) && (found_ports > 0))
        {
                printf("\nERROR: I couldn't bind any ports! Are you sure you didn't start InspIRCd twice?\n");
-               Log(DEFAULT,"ERROR: I couldn't bind any ports! Are you sure you didn't start InspIRCd twice?");
+               Logs->Log("STARTUP", DEFAULT,"ERROR: I couldn't bind any ports! Something else is bound to those ports!");
                Exit(EXIT_STATUS_BIND);
        }
 
@@ -547,7 +556,7 @@ InspIRCd::InspIRCd(int argc, char** argv)
                if (kill(getppid(), SIGTERM) == -1)
                {
                        printf("Error killing parent process: %s\n",strerror(errno));
-                       Log(DEFAULT,"Error killing parent process: %s",strerror(errno));
+                       Logs->Log("STARTUP", DEFAULT, "Error killing parent process: %s",strerror(errno));
                }
        }
 
@@ -565,7 +574,7 @@ InspIRCd::InspIRCd(int argc, char** argv)
                }
                else
                {
-                       Log(DEFAULT,"Keeping pseudo-tty open as we are running in the foreground.");
+                       Logs->Log("STARTUP", DEFAULT,"Keeping pseudo-tty open as we are running in the foreground.");
                }
        }
 #else
@@ -578,7 +587,7 @@ InspIRCd::InspIRCd(int argc, char** argv)
 #endif
 
        printf("\nInspIRCd is now running as '%s'[%s]\n", Config->ServerName,Config->GetSID().c_str());
-       Log(DEFAULT,"Startup complete as '%s'[%s]", Config->ServerName,Config->GetSID().c_str());
+       Logs->Log("STARTUP", DEFAULT, "Startup complete as '%s'[%s]", Config->ServerName,Config->GetSID().c_str());
 
        this->WritePID(Config->PID);
 }
@@ -601,6 +610,14 @@ void InspIRCd::InitialiseUID()
 
 int InspIRCd::Run()
 {
+       /* See if we're supposed to be running the test suite rather than entering the mainloop */
+       if (Config->TestSuite)
+       {
+               TestSuite* ts = new TestSuite(this);
+               delete ts;
+               Exit(0);
+       }
+
        while (true)
        {
 #ifndef WIN32