Add a counter for errored files

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

diff --git a/src/inspircd.cpp b/src/inspircd.cpp
index 5b21f197c1649aa233a1fd11ef59da3f025c8691..87af7b06e8bca45c064c0904ea352b2d0f893f0c 100644 (file)
--- a/src/inspircd.cpp
+++ b/src/inspircd.cpp
@@ -426,11 +426,9 @@ InspIRCd::InspIRCd(int argc, char** argv)
        Config->forcedebug = do_debug;
        Config->writelog = !do_nolog;   
        Config->ClearStack();
-       Config->Read(true, NULL);
 
-       // Get XLine to do it's thing.
-       this->XLines->CheckELines();
-       this->XLines->ApplyLines();
+       this->Modes = new ModeParser(this);
+       this->AddServerName(Config->ServerName);
 
        /*
         * Initialise SID/UID.
@@ -489,21 +487,51 @@ InspIRCd::InspIRCd(int argc, char** argv)
 
        SE->RecoverFromFork();
 
-       this->Modes = new ModeParser(this);
-       this->AddServerName(Config->ServerName);
-       CheckDie();
-       int bounditems = BindPorts(true, found_ports, pl);
+       this->Res = new DNS(this);
 
-       for(int t = 0; t < 255; t++)
-               Config->global_implementation[t] = 0;
+       /* Read config, pass 0. At the end if this pass,
+        * the Config->IncludeFiles is populated, we call
+        * Config->StartDownloads to initialize the downlaods of all
+        * these files.
+        */
+        Config->Read(true, NULL, 0);
+       Config->StartDownloads();
+       
+       /* Now the downloads are started, we monitor them for completion.
+        * On completion, we call Read again with pass = 1.
+        * NOTE: We really should add a timeout here
+        */
 
-       memset(&Config->implement_lists,0,sizeof(Config->implement_lists));
+       while (Config->Downloading())
+       {
+               SE->DispatchEvents();
+               this->BufferedSocketCull();
+       }
 
        printf("\n");
 
-       this->Res = new DNS(this);
+       if (Config->FileErrors)
+       {
+               /* One or more file download/access errors, do not
+                * proceed to second pass
+                */
+               Exit(EXIT_STATUS_CONFIG);
+       }
+
+       /* We have all the files we can get, initiate pass 1 */
+       Config->Read(true, NULL, 1);
+
+        // Get XLine to do it's thing.
+        this->XLines->CheckELines();
+        this->XLines->ApplyLines();
+
+
+       CheckDie();
+       int bounditems = BindPorts(true, found_ports, pl);
+
+       printf("\n");
 
-       this->Modules->LoadAll();
+       /*this->Modules->LoadAll();*/
        
        /* Just in case no modules were loaded - fix for bug #101 */
        this->BuildISupport();