(file) Return to cimserver.cpp CVS log (file) (dir) Up to [Pegasus] / pegasus / src / Server

Diff for /pegasus/src/Server/cimserver.cpp between version 1.86 and 1.87

version 1.86, 2003/03/11 21:26:54 version 1.87, 2003/03/25 23:39:59
Line 396 
Line 396 
 int main(int argc, char** argv) int main(int argc, char** argv)
 { {
     String pegasusHome  = String::EMPTY;     String pegasusHome  = String::EMPTY;
     Boolean pegasusIOLog = false;  
     String logsDirectory = String::EMPTY;     String logsDirectory = String::EMPTY;
     Boolean useSLP = false;     Boolean useSLP = false;
     Boolean daemonOption = false;     Boolean daemonOption = false;
Line 634 
Line 633 
         exit(1);         exit(1);
     }     }
  
     // The "SSL" property overrides the enableHttp*Connection properties and      Boolean enableHttpConnection = String::equal(
     // enables only the HTTPS connection.          configManager->getCurrentValue("enableHttpConnection"), "true");
     Boolean enableHttpConnection = (String::equal(      Boolean enableHttpsConnection = String::equal(
         configManager->getCurrentValue("enableHttpConnection"), "true") &&          configManager->getCurrentValue("enableHttpsConnection"), "true");
         !String::equal(configManager->getCurrentValue("SSL"), "true"));  
     Boolean enableHttpsConnection = (String::equal(  
         configManager->getCurrentValue("enableHttpsConnection"), "true") ||  
         String::equal(configManager->getCurrentValue("SSL"), "true"));  
  
     // Make sure at least one connection is enabled     // Make sure at least one connection is enabled
 #ifndef PEGASUS_LOCAL_DOMAIN_SOCKET #ifndef PEGASUS_LOCAL_DOMAIN_SOCKET
Line 667 
Line 662 
             daemonOption = true;             daemonOption = true;
         }         }
  
         //  
         // Check the log trace options and set global variable  
         //  
   
         if (String::equal(configManager->getCurrentValue("logtrace"), "true"))  
         {  
             pegasusIOLog = true;  
         }  
   
         // Get the log file directory definition.         // Get the log file directory definition.
         // We put String into Cstring because         // We put String into Cstring because
         // Directory functions only handle Cstring.         // Directory functions only handle Cstring.
Line 720 
Line 706 
         cout << "Logs Directory = " << logsDirectory << endl;         cout << "Logs Directory = " << logsDirectory << endl;
 #endif #endif
  
         if (String::equal(configManager->getCurrentValue("cleanlogs"), "true"))  
         {  
             Logger::clean(logsDirectory);;  
         }  
   
         if (String::equal(configManager->getCurrentValue("slp"), "true"))         if (String::equal(configManager->getCurrentValue("slp"), "true"))
         {         {
             useSLP =  true;             useSLP =  true;
Line 778 
Line 759 
     cout << PEGASUS_NAME << PEGASUS_VERSION << endl;     cout << PEGASUS_NAME << PEGASUS_VERSION << endl;
     cout << "Built " << __DATE__ << " " << __TIME__ << endl;     cout << "Built " << __DATE__ << " " << __TIME__ << endl;
     cout <<"Starting..."     cout <<"Starting..."
          << (pegasusIOLog ? " Tracing to Log ": " ")  
          << (useSLP ? " SLP reg. " : " No SLP ")          << (useSLP ? " SLP reg. " : " No SLP ")
         << endl;         << endl;
 #endif #endif

Legend:
Removed from v.1.86  
changed lines
  Added in v.1.87
No CVS admin address has been configured
 Powered by
ViewCVS 0.9.2