[myserver-commit] [2797] LogManager objects are allocated dinamically

[Giuseppe Scrivano]

Revision: 2797
          http://svn.sv.gnu.org/viewvc/?view=rev&root=myserver&revision=2797
Author:   gscrivano
Date:     2008-09-10 20:23:12 +0000 (Wed, 10 Sep 2008)

Log Message:
-----------
LogManager objects are allocated dinamically

Modified Paths:
--------------
    trunk/myserver/include/conf/vhost/vhost.h
    trunk/myserver/src/conf/vhost/vhost.cpp
    trunk/myserver/src/log/log_manager.cpp

Modified: trunk/myserver/include/conf/vhost/vhost.h
===================================================================
--- trunk/myserver/include/conf/vhost/vhost.h   2008-09-10 09:42:14 UTC (rev 
2796)
+++ trunk/myserver/include/conf/vhost/vhost.h   2008-09-10 20:23:12 UTC (rev 
2797)
@@ -220,8 +220,8 @@
   HashMap<string, string*> hashedData;
   NULL_REFERENCECB nullReferenceCb;
   Mutex refMutex;
-       LogManager warningsLogFile;
-       LogManager accessesLogFile;
+       LogManager *warningsLogFile;
+       LogManager *accessesLogFile;
 
   MimeManager mimeManager;
 

Modified: trunk/myserver/src/conf/vhost/vhost.cpp
===================================================================
--- trunk/myserver/src/conf/vhost/vhost.cpp     2008-09-10 09:42:14 UTC (rev 
2796)
+++ trunk/myserver/src/conf/vhost/vhost.cpp     2008-09-10 20:23:12 UTC (rev 
2797)
@@ -73,8 +73,11 @@
   
   warningsLogFileName.assign("");
  
-  warningsLogFile.close();
-  accessesLogFile.close();
+  warningsLogFile->close();
+  accessesLogFile->close();
+
+  delete warningsLogFile;
+  delete accessesLogFile;
   
   documentRoot.assign("");
   systemRoot.assign("");
@@ -159,39 +162,43 @@
 {
   const char* accessesLogFileName = getAccessesLogFileName();
   const char* warningsLogFileName = getWarningsLogFileName();
+
+  accessesLogFile = new LogManager();
+  warningsLogFile = new LogManager();
+
   if(accessesLogFileName)
   {
-    accessesLogFile.load(accessesLogFileName);
+    accessesLogFile->load(accessesLogFileName);
     
     if(strstr(getAccessLogOpt(), "cycle=yes"))
     {
-      accessesLogFile.setCycleLog(1);
+      accessesLogFile->setCycleLog(1);
     }
     if(strstr(getAccessLogOpt(), "cycle_gzip=no"))
     {
-      accessesLogFile.setGzip(0);
+      accessesLogFile->setGzip(0);
     }
     else
     {
-      accessesLogFile.setGzip(1);
+      accessesLogFile->setGzip(1);
     }  
   }
 
   if(warningsLogFileName)
   {
-    warningsLogFile.load(warningsLogFileName);
+    warningsLogFile->load(warningsLogFileName);
     if(strstr(getWarningLogOpt(), "cycle=yes"))
     {
-      warningsLogFile.setCycleLog(1);
+      warningsLogFile->setCycleLog(1);
     }
   
     if(strstr(getWarningLogOpt(), "cycle_gzip=no"))
     {
-      warningsLogFile.setGzip(0);
+      warningsLogFile->setGzip(0);
     }
     else
     {
-      warningsLogFile.setGzip(1);
+      warningsLogFile->setGzip(1);
     }
   }
 
@@ -399,7 +406,7 @@
  */
 u_long Vhost::accessesLogRequestAccess(int id)
 {
-  accessesLogFile.requestAccess();
+  accessesLogFile->requestAccess();
   return 0;
 }
 
@@ -409,7 +416,7 @@
  */
 u_long Vhost::warningsLogRequestAccess(int id)
 {
-  warningsLogFile.requestAccess();
+  warningsLogFile->requestAccess();
   return 0;
 }
 
@@ -419,7 +426,7 @@
  */
 u_long Vhost::accessesLogTerminateAccess(int id)
 {
-  accessesLogFile.terminateAccess();
+  accessesLogFile->terminateAccess();
   return 0;
 }
 
@@ -429,7 +436,7 @@
  */
 u_long Vhost::warningsLogTerminateAccess(int id)
 {
-  warningsLogFile.terminateAccess();
+  warningsLogFile->terminateAccess();
   return 0;
 }
 
@@ -439,7 +446,7 @@
  */
 int Vhost::accessesLogWrite(const char* str)
 {
-  return accessesLogFile.write(str);
+  return accessesLogFile->write(str);
 }
 
 /*!
@@ -447,7 +454,7 @@
  */
 File* Vhost::getAccessesLogFile()
 {
-  return accessesLogFile.getFile();
+  return accessesLogFile->getFile();
 }
 
 /*!
@@ -455,7 +462,7 @@
  */
 LogManager* Vhost::getWarningsLog()
 {
-  return &warningsLogFile;
+  return warningsLogFile;
 }
 
 /*!
@@ -463,7 +470,7 @@
  */
 LogManager* Vhost::getAccessesLog()
 {
-  return &accessesLogFile;
+  return accessesLogFile;
 }
 
 /*!
@@ -481,7 +488,7 @@
 #else
   msg.append("\n");
 #endif  
-  return warningsLogFile.write(msg.c_str());
+  return warningsLogFile->write(msg.c_str());
 }
 
 /*!
@@ -489,7 +496,7 @@
  */
 File* Vhost::getWarningsLogFile()
 {
-  return warningsLogFile.getFile();
+  return warningsLogFile->getFile();
 }
 
 /*!
@@ -498,8 +505,8 @@
  */
 void Vhost::setMaxLogSize(int newSize)
 {
-  warningsLogFile.setMaxSize(newSize);
-  accessesLogFile.setMaxSize(newSize);  
+  warningsLogFile->setMaxSize(newSize);
+  accessesLogFile->setMaxSize(newSize);  
 }
 
 /*!
@@ -511,7 +518,7 @@
    *warningsLogFile max log size is equal to the  
    *accessesLogFile one.
    */
-  return warningsLogFile.getMaxSize( );
+  return warningsLogFile->getMaxSize( );
 }
 
 /*!

Modified: trunk/myserver/src/log/log_manager.cpp
===================================================================
--- trunk/myserver/src/log/log_manager.cpp      2008-09-10 09:42:14 UTC (rev 
2796)
+++ trunk/myserver/src/log/log_manager.cpp      2008-09-10 20:23:12 UTC (rev 
2797)
@@ -202,7 +202,7 @@
  */
 void LogManager::setGzip(bool useGzip)
 {
-  gzipLog=useGzip;
+  gzipLog = useGzip;
 }
 
 /*!