(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.7 and 1.13

version 1.7, 2001/05/10 10:57:20 version 1.13, 2001/06/02 02:25:33
Line 32 
Line 32 
 #include <Pegasus/Common/OptionManager.h> #include <Pegasus/Common/OptionManager.h>
 #include <Pegasus/Server/CIMServer.h> #include <Pegasus/Server/CIMServer.h>
 #include <Pegasus/Common/PegasusVersion.h> #include <Pegasus/Common/PegasusVersion.h>
   #include <Pegasus/Protocol/Handler.h>
   #include <Pegasus/Common/Logger.h>
   
   PEGASUS_USING_PEGASUS;
   PEGASUS_USING_STD;
  
 using namespace Pegasus;  
 using namespace std;  
  
 // const char PEGASUS_VERSION[]  = "Pegasus CIM Server - Version 0.7";  
  
 void GetEnvironmentVariables( void GetEnvironmentVariables(
     const char* arg0,     const char* arg0,
Line 56 
Line 58 
     FileSystem::translateSlashes(pegasusHome);     FileSystem::translateSlashes(pegasusHome);
 } }
  
   /** GetOptions function - This function defines the Options Table
       and sets up the options from that table using the option manager.
   */
 void GetOptions( void GetOptions(
     OptionManager& om,     OptionManager& om,
     int& argc,     int& argc,
Line 65 
Line 70 
     static struct OptionRow options[] =     static struct OptionRow options[] =
     {     {
         {"port", "8888", false, Option::WHOLE_NUMBER, 0, 0, "port"},         {"port", "8888", false, Option::WHOLE_NUMBER, 0, 0, "port"},
         {"trace", "false", false, Option::BOOLEAN, 0, 0, "trace"},          {"trace", "false", false, Option::BOOLEAN, 0, 0, "t"},
           {"severity", "ALL", false, Option::STRING, 0, 0, "s"},
           {"logs", "ALL", false, Option::STRING, 0, 0, "L"},
           {"daemon", "false", false, Option::STRING, 0, 0, "d"},
         {"version", "false", false, Option::BOOLEAN, 0, 0, "v"},         {"version", "false", false, Option::BOOLEAN, 0, 0, "v"},
         {"help", "false", false, Option::BOOLEAN, 0, 0, "h"}          {"help", "false", false, Option::BOOLEAN, 0, 0, "h"},
           {"debug", "false", false, Option::BOOLEAN, 0, 0, "d"}
     };     };
     const Uint32 NUM_OPTIONS = sizeof(options) / sizeof(options[0]);     const Uint32 NUM_OPTIONS = sizeof(options) / sizeof(options[0]);
  
Line 83 
Line 92 
     om.checkRequiredOptions();     om.checkRequiredOptions();
 } }
  
   /* PrintHelp - This is temporary until we expand the options manager to allow
      options help to be defined with the OptionRow entries and presented from
      those entries.
   */
 void PrintHelp(const char* arg0) void PrintHelp(const char* arg0)
 { {
     cout << '\n';     cout << '\n';
Line 94 
Line 107 
     cout << "    -port - specifies port number to listen on\n";     cout << "    -port - specifies port number to listen on\n";
     cout << "    -v - prints out the version number\n";     cout << "    -v - prints out the version number\n";
     cout << "    -t - turns on trace mode\n";     cout << "    -t - turns on trace mode\n";
       cout << "    -d - turns on debug mode\n";
     cout << endl;     cout << endl;
 } }
  
   //////////////////////////////////////////////////////////////////////////
   //  MAIN
   //////////////////////////////////////////////////////////////////////////
 int main(int argc, char** argv) int main(int argc, char** argv)
 { {
     // Get environment variables:     // Get environment variables:
Line 154 
Line 171 
         exit(0);         exit(0);
     }     }
  
       // Check the trace options and set global variable
       Boolean pegasusIOTrace = false;
       if (om.valueEquals("trace", "true"))
       {
            Handler::sethandlerTrace(true);
            pegasusIOTrace = true;
            cout << "Trace Set" << endl;
       }
   
     // Grab the port otpion:     // Grab the port otpion:
  
     String portOption;     String portOption;
     om.lookupValue("port", portOption);     om.lookupValue("port", portOption);
  
     try  
     {  
         Selector selector;  
         CIMServer server(&selector, pegasusHome);  
   
         char* address = portOption.allocateCString();         char* address = portOption.allocateCString();
  
         // Put out startup up message.         // Put out startup up message.
Line 172 
Line 193 
         cout << PEGASUS_NAME << PEGASUS_VERSION <<         cout << PEGASUS_NAME << PEGASUS_VERSION <<
              " on port " << address << endl;              " on port " << address << endl;
         cout << "Built " << __DATE__ << " " << __TIME__ << endl;         cout << "Built " << __DATE__ << " " << __TIME__ << endl;
         cout <<"Started..." <<endl;      cout <<"Started..."
            << (pegasusIOTrace ? " Tracing": " ") << endl;
   
       // Set up the Logger
       Logger::setHomeDirectory("./logs");
   
       // Put server start message to the logger
       Logger::put(Logger::STANDARD_LOG, "CIMServer", Logger::INFORMATION,
           "Start $0 %1 port $2 $3 ", 88, PEGASUS_NAME, PEGASUS_VERSION,
                   address, (pegasusIOTrace ? " Tracing": " "));
   
       // try loop to bind the address, and run the server
       try
       {
           Selector selector;
           CIMServer server(&selector, pegasusHome);
  
         server.bind(address);         server.bind(address);
         delete [] address;         delete [] address;
Line 180 
Line 216 
     }     }
     catch(Exception& e)     catch(Exception& e)
     {     {
         std::cerr << "Error: " << e.getMessage() << std::endl;          PEGASUS_STD(cerr) << "Error: " << e.getMessage() << PEGASUS_STD(endl);
     }     }
  
     return 0;     return 0;

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