[myserver-commit] [2805] Libraries loading code isolated into Server::loadLibraries.

[Giuseppe Scrivano]

Revision: 2805
          http://svn.sv.gnu.org/viewvc/?view=rev&root=myserver&revision=2805
Author:   gscrivano
Date:     2008-09-13 09:19:48 +0000 (Sat, 13 Sep 2008)

Log Message:
-----------
Libraries loading code isolated into Server::loadLibraries.

Modified Paths:
--------------
    trunk/myserver/include/server/server.h
    trunk/myserver/src/myserver.cpp
    trunk/myserver/src/server/server.cpp

Modified: trunk/myserver/include/server/server.h
===================================================================
--- trunk/myserver/include/server/server.h      2008-09-12 23:38:39 UTC (rev 
2804)
+++ trunk/myserver/include/server/server.h      2008-09-13 09:19:48 UTC (rev 
2805)
@@ -77,6 +77,8 @@
                return instance;
        }
 
+  int loadLibraries();
+
        CachedFileFactory* getCachedFiles();
   const char* getHashedData(const char* name);
 

Modified: trunk/myserver/src/myserver.cpp
===================================================================
--- trunk/myserver/src/myserver.cpp     2008-09-12 23:38:39 UTC (rev 2804)
+++ trunk/myserver/src/myserver.cpp     2008-09-13 09:19:48 UTC (rev 2805)
@@ -204,7 +204,6 @@
   try
   {
     Server::createInstance();
-    Process::initialize();
   }
   catch(...)
   {
@@ -553,7 +552,7 @@
   char path [MAX_PATH];
   GetCurrentDirectory(MAX_PATH,path);
   strcat(path,"\\");
-  strcat(path,"myServer.exe SERVICE");
+  strcat(path,"myserver.exe SERVICE");
   
   manager = OpenSCManager(NULL,NULL,SC_MANAGER_ALL_ACCESS);
   if (manager)

Modified: trunk/myserver/src/server/server.cpp
===================================================================
--- trunk/myserver/src/server/server.cpp        2008-09-12 23:38:39 UTC (rev 
2804)
+++ trunk/myserver/src/server/server.cpp        2008-09-13 09:19:48 UTC (rev 
2805)
@@ -102,6 +102,34 @@
 }
 
 /*!
+ *Load here all the libraries.
+ */
+int Server::loadLibraries()
+{
+  Process::initialize();
+
+  setcwdBuffer();
+  XmlParser::startXML();
+  myserver_safetime_init();
+  
+  /* Startup the socket library.  */
+  logWriteln(languageParser.getValue("MSG_ISOCK") );
+
+  if(startupSocketLib(MAKEWORD( 1, 1)) != 0)
+  {
+    logPreparePrintError();
+    logWriteln( languageParser.getValue("MSG_SERVER_CONF") );
+    logEndPrintError();
+    return 1;
+  }
+
+  logWriteln(languageParser.getValue("MSG_SOCKSTART") );
+
+  return 0;
+}
+
+
+/*!
  *Destroy the object.
  */
 Server::~Server()
@@ -131,12 +159,9 @@
 
   try
   {
-    setcwdBuffer();
+    if(loadLibraries())
+      return;
 
-    XmlParser::startXML();
-
-    myserver_safetime_init();
-
     /*
      *Setup the server configuration.
      */
@@ -152,18 +177,6 @@
 
     logWriteln( languageParser.getValue("MSG_SERVER_CONF") );
 
-    /* Startup the socket library.  */
-    logWriteln( languageParser.getValue("MSG_ISOCK") );
-    err = startupSocketLib(/* MAKEWORD( 2, 2 ) */MAKEWORD( 1, 1));
-    if (err != 0)
-    {
-      logPreparePrintError();
-      logWriteln( languageParser.getValue("MSG_SERVER_CONF") );
-      logEndPrintError();
-      return;
-    }
-    logWriteln( languageParser.getValue("MSG_SOCKSTART") );
-
     /*
      *Get the name of the local machine.
      */
@@ -232,17 +245,14 @@
     connectionsScheduler.restart();
 
     listenThreads.initialize(&languageParser);
+
     if(vhostList)
-    {
       delete vhostList;
-      vhostList = 0;
-    }
 
     vhostList = new VhostManager(&listenThreads);
-    if(vhostList == 0)
-    {
+
+    if(vhostList == NULL)
       return;
-    }
 
     getProcessServerManager()->load();
 
@@ -314,6 +324,7 @@
   };
   this->terminate();
   finalCleanup();
+
 #ifdef WIN32
   WSACleanup();
 #endif// WIN32