(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.15 and 1.16

version 1.15, 2001/06/03 17:05:03 version 1.16, 2001/06/05 12:52:33
Line 21 
Line 21 
 // //
 // Author: Mike Brasher (mbrasher@bmc.com) // Author: Mike Brasher (mbrasher@bmc.com)
 // //
 // Modified By:  // Modified By: Karl Schopmeyer (k.schopmeyer@opengroup.org)
 // //
 //%///////////////////////////////////////////////////////////////////////////// //%/////////////////////////////////////////////////////////////////////////////
  
Line 84 
Line 84 
                         "Not Used "},                         "Not Used "},
         {"logdir", "./logs", false, Option::STRING, 0, 0, "logdir",         {"logdir", "./logs", false, Option::STRING, 0, 0, "logdir",
                         "Directory for log files"},                         "Directory for log files"},
         {"clearlogs", "false", false, Option::BOOLEAN, 0, 0, "cl",          {"cleanlogs", "false", false, Option::BOOLEAN, 0, 0, "clean",
                         "Clears the log files at startup"},                         "Clears the log files at startup"},
         {"daemon", "false", false, Option::BOOLEAN, 0, 0, "d",         {"daemon", "false", false, Option::BOOLEAN, 0, 0, "d",
                         "Not Used "},                         "Not Used "},
Line 175 
Line 175 
     }     }
  
     // Check to see if user asked for help (-h otpion):     // Check to see if user asked for help (-h otpion):
   
     String helpOption;     String helpOption;
  
     if (om.lookupValue("help", helpOption) && helpOption == "true")     if (om.lookupValue("help", helpOption) && helpOption == "true")
Line 212 
Line 211 
     String logsDirectory;     String logsDirectory;
     om.lookupValue("logdir", logsDirectory);     om.lookupValue("logdir", logsDirectory);
  
     char* lgDir = logsDirectory.allocateCString();      // Set up the Logger. This does not open the logs
       // Might be more logical to clean before set.
     if (!System::isDirectory(lgDir))      // ATTN: Need tool to completely disable logging.
         System::makeDirectory(lgDir);      Logger::setHomeDirectory(logsDirectory);
  
     if (!System::isDirectory(lgDir))      if (om.valueEquals("cleanlogs", "true"))
         cout << "Logging Disabled";      {
     delete [] lgDir;          Logger::clean(logsDirectory);;
       }
  
       // Leave this in until people get familiar with the logs.
     cout << "Logs Directory = " << logsDirectory << endl;     cout << "Logs Directory = " << logsDirectory << endl;
  
  
Line 240 
Line 241 
     if (om.valueEquals("options", "true"))     if (om.valueEquals("options", "true"))
         om.print();         om.print();
  
     // Set up the Logger  
     Logger::setHomeDirectory(logsDirectory);  
   
   
     // Put server start message to the logger     // Put server start message to the logger
     Logger::put(Logger::STANDARD_LOG, "CIMServer", Logger::INFORMATION,     Logger::put(Logger::STANDARD_LOG, "CIMServer", Logger::INFORMATION,
         "Start $0 $1 port $2 $3 ", 88, PEGASUS_NAME,          "Start $0 $1 port $2 $3 ",
         PEGASUS_VERSION, address, (pegasusIOTrace ? " Tracing": " "));                  PEGASUS_NAME,
                   PEGASUS_VERSION,
                   address,
                   (pegasusIOTrace ? " Tracing": " "));
  
     // try loop to bind the address, and run the server     // try loop to bind the address, and run the server
     try     try
Line 259 
Line 259 
         server.bind(address);         server.bind(address);
         delete [] address;         delete [] address;
         server.runForever();         server.runForever();
   
           Logger::put(Logger::STANDARD_LOG, "CIMServer", Logger::INFORMATION,
               "Normal Termination");
   
     }     }
     catch(Exception& e)     catch(Exception& e)
     {     {
           Logger::put(Logger::STANDARD_LOG, "CIMServer", Logger::INFORMATION,
               "Abnormal Termination $0", e.getMessage());
   
         PEGASUS_STD(cerr) << "Error: " << e.getMessage() << PEGASUS_STD(endl);         PEGASUS_STD(cerr) << "Error: " << e.getMessage() << PEGASUS_STD(endl);
     }     }
  


Legend:
Removed from v.1.15  
changed lines
  Added in v.1.16

No CVS admin address has been configured
Powered by
ViewCVS 0.9.2