(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.44 and 1.74

version 1.44, 2002/05/03 18:15:13 version 1.74, 2002/09/25 02:18:17
Line 1 
Line 1 
 //%///////////////////////////////////////////////////////////////////////////// //%/////////////////////////////////////////////////////////////////////////////
 // //
 // Copyright (c) 2000, 2001 The Open group, BMC Software, Tivoli Systems, IBM  // Copyright (c) 2000, 2001, 2002 BMC Software, Hewlett-Packard Company, IBM,
   // The Open Group, Tivoli Systems
 // //
 // Permission is hereby granted, free of charge, to any person obtaining a copy // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to // of this software and associated documentation files (the "Software"), to
Line 31 
Line 32 
 // Modified By: Jenny Yu (jenny_yu@hp.com) // Modified By: Jenny Yu (jenny_yu@hp.com)
 // //
 // Modified By: Sushma Fernandes (sushma_fernandes@hp.com) // Modified By: Sushma Fernandes (sushma_fernandes@hp.com)
   //              Carol Ann Krug Graves, Hewlett-Packard Company
   //                (carolann_graves@hp.com)
   //              Yi Zhou, Hewlett-Packard Company (yi_zhou@hp.com)
 // //
 //%///////////////////////////////////////////////////////////////////////////// //%/////////////////////////////////////////////////////////////////////////////
  
Line 39 
Line 43 
 // //
 // Notes on deamon operation (Unix) and service operation (Win 32): // Notes on deamon operation (Unix) and service operation (Win 32):
 // //
 // To run pegasus as a daemon on Unix platforms, use the -d option:  // To run pegasus as a daemon on Unix platforms:
 // //
 // cimserver -d  // cimserver
 // //
 // The -d option has no effect on windows operation.  // To NOT run pegasus as a daemon on Unix platforms, set the daemon config
   // property to false:
   //
   // cimserver daemon=false
   //
   // The daemon config property has no effect on windows operation.
 // //
 // To shutdown pegasus, use the -s option: // To shutdown pegasus, use the -s option:
 // //
 // cimserver -s [-f] [-T timeout_value]  // cimserver -s
 // //
 // To run pegasus as an NT service, there are FOUR  different possibilities: // To run pegasus as an NT service, there are FOUR  different possibilities:
 // //
Line 76 
Line 85 
  
  
 #include <Pegasus/Common/Config.h> #include <Pegasus/Common/Config.h>
   #include <Pegasus/Common/Constants.h>
 #include <iostream> #include <iostream>
 #include <cassert> #include <cassert>
 #include <cstdlib> #include <cstdlib>
   #include <fstream>
 #include <Pegasus/Common/FileSystem.h> #include <Pegasus/Common/FileSystem.h>
 #include <Pegasus/Common/Monitor.h> #include <Pegasus/Common/Monitor.h>
 #include <Pegasus/Server/CIMServer.h> #include <Pegasus/Server/CIMServer.h>
Line 90 
Line 101 
 #include <Pegasus/Client/CIMClient.h> #include <Pegasus/Client/CIMClient.h>
 #include <Pegasus/Server/ShutdownService.h> #include <Pegasus/Server/ShutdownService.h>
 #include <Pegasus/Common/Destroyer.h> #include <Pegasus/Common/Destroyer.h>
 #if !defined(PEGASUS_OS_ZOS) && ! defined(PEGASUS_OS_HPUX)  #if !defined(PEGASUS_OS_ZOS) && ! defined(PEGASUS_OS_HPUX) && ! defined(PEGASUS_NO_SLP)
 #include <slp/slp.h> #include <slp/slp.h>
 #endif #endif
  
Line 98 
Line 109 
 #if defined(PEGASUS_OS_TYPE_WINDOWS) #if defined(PEGASUS_OS_TYPE_WINDOWS)
 # include "cimserver_windows.cpp" # include "cimserver_windows.cpp"
 #elif defined(PEGASUS_OS_TYPE_UNIX) #elif defined(PEGASUS_OS_TYPE_UNIX)
   # if defined(PEGASUS_OS_OS400)
   #  include "cimserver_os400.cpp"
   # else
 # include "cimserver_unix.cpp" # include "cimserver_unix.cpp"
   #endif
 #else #else
 # error "Unsupported platform" # error "Unsupported platform"
 #endif #endif
Line 127 
Line 142 
  
 static const char OPTION_SHUTDOWN    = 's'; static const char OPTION_SHUTDOWN    = 's';
  
 static const char OPTION_FORCE       = 'f';  #if defined(PEGASUS_OS_HPUX)
   static const char OPTION_BINDVERBOSE = 'X';
 static const char OPTION_TIMEOUT     = 'T';  #endif
  
 static const String NAMESPACE = "root/PG_Internal";  static const String PROPERTY_TIMEOUT = "shutdownTimeout";
 static const String CLASSNAME_SHUTDOWNSERVICE = "PG_ShutdownService";  static const String CIMSERVERSTART_FILE = "/etc/opt/wbem/cimserver_start.conf";
 static const String PROPERTY_TIMEOUT = "operationTimeout";  
  
 ConfigManager*    configManager; ConfigManager*    configManager;
  
Line 191 
Line 205 
     usage.append (COMMAND_NAME);     usage.append (COMMAND_NAME);
     usage.append (" [ [ options ] | [ configProperty=value, ... ] ]\n");     usage.append (" [ [ options ] | [ configProperty=value, ... ] ]\n");
     usage.append ("  options\n");     usage.append ("  options\n");
     usage.append ("    -v          - displays pegasus version number\n");      usage.append ("    -v          - displays CIM Server version number\n");
     usage.append ("    -h          - prints this help message\n");     usage.append ("    -h          - prints this help message\n");
       usage.append ("    -s          - shuts down CIM Server\n");
   #ifndef PEGASUS_OS_HPUX
     usage.append ("    -D [home]   - sets pegasus home directory\n");     usage.append ("    -D [home]   - sets pegasus home directory\n");
     usage.append ("    -t          - turns tracing on\n");  #endif
     usage.append ("    -t          - turns on trace of client IO to console\n");  #if defined(PEGASUS_OS_TYPE_WINDOWS)
     usage.append ("    -l          - turns on trace of client IO to trace file\n");  
     usage.append ("    -d          - runs pegasus as a daemon\n");  
     usage.append ("    -s [-f] [-T timeout] \n");  
     usage.append ("                - shuts down pegasus\n");  
     usage.append ("    -cleanlogs  - clears the log files at startup\n");  
     usage.append ("    -install    - installs pegasus as a Windows NT Service\n");     usage.append ("    -install    - installs pegasus as a Windows NT Service\n");
     usage.append ("    -remove     - removes pegasus as a Windows NT Service\n");     usage.append ("    -remove     - removes pegasus as a Windows NT Service\n");
     usage.append ("    -slp        - registers pegasus as a service with SLP\n\n");  #endif
     usage.append ("    -SSL        - uses SSL\n\n");  
   
     usage.append ("  configProperty=value\n");     usage.append ("  configProperty=value\n");
     usage.append ("    port=nnnn            - sets port number to listen on\n");      usage.append ("                - sets CIM Server configuration property\n");
     usage.append ("    logdir=/pegasus/logs - directory for log files\n");  
  
     cout << endl;     cout << endl;
   #if defined(PEGASUS_OS_HPUX)
       cout << PLATFORM_PRODUCT_NAME << " " << PLATFORM_PRODUCT_VERSION << endl;
   #else
     cout << PEGASUS_NAME << PEGASUS_VERSION << endl;     cout << PEGASUS_NAME << PEGASUS_VERSION << endl;
   #endif
     cout << endl;     cout << endl;
     cout << usage << endl;     cout << usage << endl;
 } }
  
 void shutdownCIMOM(Boolean forceOption, Uint32 timeoutValue)  void shutdownCIMOM(Uint32 timeoutValue)
 { {
     //     //
     // Create CIMClient object     // Create CIMClient object
Line 224 
Line 236 
     CIMClient client;     CIMClient client;
  
     //     //
     // Get the port number      // Get local host name
     //     //
     String portNumberStr = configManager->getCurrentValue("port");  
   
     String hostStr = System::getHostName();     String hostStr = System::getHostName();
     hostStr.append(":");  
     hostStr.append(portNumberStr);  
   
     // Put server shutdown message to the logger  
     Logger::put(Logger::STANDARD_LOG, "CIMServer", Logger::INFORMATION,  
         "Shutdown $0 on port $1.", PEGASUS_NAME, portNumberStr);  
  
     //     //
     // open connection to CIMOM     // open connection to CIMOM
Line 242 
Line 246 
     try     try
     {     {
         client.connectLocal();         client.connectLocal();
   
           //
           // set client timeout to 2 seconds
           //
           client.setTimeout(2000);
     }     }
     catch(CIMClientException& e)      catch(Exception& e)
     {     {
         Logger::put(Logger::STANDARD_LOG, "CIMServer", Logger::INFORMATION,          PEGASUS_STD(cerr) << "Unable to connect to CIM Server." << PEGASUS_STD(endl);
             "Failed to connect to $0 $1.", PEGASUS_NAME, e.getMessage());          PEGASUS_STD(cerr) << "CIM Server may not be running." << PEGASUS_STD(endl);
   #ifdef PEGASUS_OS_OS400
         PEGASUS_STD(cerr) << "Failed to connect to server: " << e.getMessage() << PEGASUS_STD(endl);          // The server job may still be active but not responding.
         exit(1);          // Kill the job if it exists.
           cimserver_kill();
   #endif
           exit(0);
     }     }
  
     try     try
     {     {
         //         //
         // construct CIMReference          // construct CIMObjectPath
         //         //
         String referenceStr = "//";         String referenceStr = "//";
         referenceStr.append(hostStr);         referenceStr.append(hostStr);
         referenceStr.append("/root/cimv2:PG_ShutdownService");          referenceStr.append("/");
         CIMReference reference(referenceStr);          referenceStr.append(PEGASUS_NAMESPACENAME_SHUTDOWN.getString());
           referenceStr.append(":");
           referenceStr.append(PEGASUS_CLASSNAME_SHUTDOWN.getString());
           CIMObjectPath reference(referenceStr);
  
         //         //
         // issue the invokeMethod request on the shutdown method         // issue the invokeMethod request on the shutdown method
Line 268 
Line 283 
         Array<CIMParamValue> inParams;         Array<CIMParamValue> inParams;
         Array<CIMParamValue> outParams;         Array<CIMParamValue> outParams;
  
           // set force option to true for now
         inParams.append(CIMParamValue("force",         inParams.append(CIMParamValue("force",
             CIMValue(Boolean(forceOption))));              CIMValue(Boolean(true))));
  
         inParams.append(CIMParamValue("timeout",         inParams.append(CIMParamValue("timeout",
             CIMValue(Uint32(timeoutValue))));             CIMValue(Uint32(timeoutValue))));
  
         CIMValue retValue = client.invokeMethod(         CIMValue retValue = client.invokeMethod(
             NAMESPACE,              PEGASUS_NAMESPACENAME_SHUTDOWN,
             reference,             reference,
             "shutdown",             "shutdown",
             inParams,             inParams,
             outParams);             outParams);
   
         // Put server shutdown message to the logger  
         Logger::put(Logger::STANDARD_LOG, "CIMServer", Logger::INFORMATION,  
             "$0 terminated on port $1.", PEGASUS_NAME, portNumberStr);  
   
     }     }
     catch(CIMClientCIMException& e)      catch(CIMException& e)
     {     {
         PEGASUS_STD(cerr) << "Failed to shutdown server: " << e.getMessage() << PEGASUS_STD(endl);          PEGASUS_STD(cerr) << "Failed to shutdown server: ";
         exit(1);          if (e.getCode() == CIM_ERR_INVALID_NAMESPACE)
           {
               PEGASUS_STD(cerr) << "The repository may be empty.";
               PEGASUS_STD(cerr) << PEGASUS_STD(endl);
     }     }
     catch(CIMClientException& e)          else
     {     {
         // this may mean the cimserver has been terminated              PEGASUS_STD(cerr) << e.getMessage() << PEGASUS_STD(endl);
           }
   #ifdef PEGASUS_OS_OS400
           // Kill the server job.
           cimserver_kill();
   #endif
           exit(1);
     }     }
     catch(Exception& e)     catch(Exception& e)
     {     {
         PEGASUS_STD(cerr) << "Failed to shutdown server: " << e.getMessage() << PEGASUS_STD(endl);          //
         exit(1);          // This may mean the CIM Server has been terminated and returns a
           // "Empty HTTP response message" HTTP error response.  To be sure
           // CIM Server gets shutdown, if CIM Server is still running at
           // this time, we will kill the cimserver process.
           //
           // give CIM Server some time to finish up
           //
           //System::sleep(1);
           //cimserver_kill();
   
           //
           // Check to see if CIMServer is still running.  If CIMServer
           // is still running and the shutdown timeout has not expired,
           // loop and wait one second until either CIM Server is
           // terminated or until timeout expires.  If timeout expires
           // and CIMServer is still running, kill the CIMServer
           // process.
           //
           Uint32 maxWaitTime = timeoutValue - 2;
           Boolean running = isCIMServerRunning();
           while ( running && maxWaitTime > 0 )
           {
               System::sleep(1);
               running = isCIMServerRunning();
               maxWaitTime = maxWaitTime - 1;
     }     }
  
           if (running)
           {
               cimserver_kill();
           }
       }
       //catch(Exception& e)
       //{
       //    PEGASUS_STD(cerr) << "Error occurred while stopping the CIM Server: ";
       //    PEGASUS_STD(cerr) << e.getMessage() << PEGASUS_STD(endl);
       //    exit(1);
       //}
   
     return;     return;
 } }
  
Line 311 
Line 367 
 int main(int argc, char** argv) int main(int argc, char** argv)
 { {
     String pegasusHome  = String::EMPTY;     String pegasusHome  = String::EMPTY;
     Boolean pegasusIOTrace = false;  
     Boolean pegasusIOLog = false;     Boolean pegasusIOLog = false;
     String portOption = String::EMPTY;      String httpPort = String::EMPTY;
       String httpsPort = String::EMPTY;
     String logsDirectory = String::EMPTY;     String logsDirectory = String::EMPTY;
     Boolean useSLP = false;     Boolean useSLP = false;
     Boolean useSSL = false;     Boolean useSSL = false;
     Boolean daemonOption = false;     Boolean daemonOption = false;
     Boolean shutdownOption = false;     Boolean shutdownOption = false;
     Boolean forceOption = false;      Uint32 timeoutValue  = 0;
     Boolean timeoutOption = false;  
     String  timeoutStr  = String::EMPTY;  #ifdef PEGASUS_OS_OS400
     long timeoutValue  = 0;      // Initialize Pegasus home to the shipped OS/400 directory.
       pegasusHome = OS400_DEFAULT_PEGASUS_HOME;
   #endif
  
     //     //
     // Get environment variables:     // Get environment variables:
Line 344 
Line 402 
     }     }
     else     else
     {     {
         // Get help, version and home options          // Get help, version, and shutdown options
  
         for (int i = 1; i < argc; )         for (int i = 1; i < argc; )
         {         {
Line 361 
Line 419 
                 //                 //
                 if (*option == OPTION_VERSION)                 if (*option == OPTION_VERSION)
                 {                 {
   #if defined(PEGASUS_OS_HPUX)
                       cout << PLATFORM_PRODUCT_VERSION << endl;
   #else
                     cout << PEGASUS_VERSION << endl;                     cout << PEGASUS_VERSION << endl;
   #endif
                     exit(0);                     exit(0);
                 }                 }
                 //                 //
Line 372 
Line 434 
                     PrintHelp(argv[0]);                     PrintHelp(argv[0]);
                     exit(0);                     exit(0);
                 }                 }
   #ifndef PEGASUS_OS_HPUX
                 else if (*option == OPTION_HOME)                 else if (*option == OPTION_HOME)
                 {                 {
                     if (i + 1 < argc)                     if (i + 1 < argc)
Line 387 
Line 450 
                     memmove(&argv[i], &argv[i + 2], (argc-i-1) * sizeof(char*));                     memmove(&argv[i], &argv[i + 2], (argc-i-1) * sizeof(char*));
                     argc -= 2;                     argc -= 2;
                 }                 }
   #endif
   #if defined(PEGASUS_OS_HPUX)
                 //                 //
                 // Check to see if user asked for shutdown (-s option):                  // Check to see if user asked for the version (-X option):
                 //  
                 else if (*option == OPTION_SHUTDOWN)  
                 {  
                     //  
                     // Check to see if shutdown has already been specified:  
                     //                     //
                     if (shutdownOption)                  if (*option == OPTION_BINDVERBOSE)
                     {                     {
                         cout << "Duplicate shutdown option specified." << endl;                      System::bindVerbose = true;
                         exit(0);                      cout << "Unsupported debug option, BIND_VERBOSE, enabled."
                     }                           << endl;
                     shutdownOption = true;  
   
                     // remove the option from the command line                     // remove the option from the command line
                     memmove(&argv[i], &argv[i + 1], (argc-i) * sizeof(char*));                     memmove(&argv[i], &argv[i + 1], (argc-i) * sizeof(char*));
                     argc--;                     argc--;
                 }                 }
                 else if (*option == OPTION_FORCE)  #endif
                 {  
                     //                     //
                     // Check to see if shutdown has been specified:                  // Check to see if user asked for shutdown (-s option):
                     //                     //
                     if (!shutdownOption)                  else if (*option == OPTION_SHUTDOWN)
                     {                     {
                         cout << "Invalid option -" << option << endl;  
                         exit(0);  
                     }  
   
                     //                     //
                     // Check to see if force has already been specified:                      // check to see if user is root
                     //                     //
                     if (forceOption)  #ifndef PEGASUS_OS_OS400
                       if (!System::isPrivilegedUser(System::getEffectiveUserName()))
                     {                     {
                         cout << "Duplicate force option specified." << endl;                          cout << "You must have superuser privilege to run ";
                           cout << "cimserver." << endl;
                         exit(0);                         exit(0);
                     }                     }
   #endif
  
                     forceOption = true;  
   
                     // remove the option from the command line  
                     memmove(&argv[i], &argv[i + 1], (argc-i) * sizeof(char*));  
                     argc--;  
                 }  
                 else if (*option == OPTION_TIMEOUT)  
                 {  
                     //                     //
                     // Check to see if shutdown has been specified:                      // Check to see if shutdown has already been specified:
                     //                     //
                     if (!shutdownOption)                      if (shutdownOption)
                     {  
                         cout << "Invalid option -" << option << endl;  
                         exit(0);  
                     }  
   
                     if (timeoutOption)  
                     {                     {
                         cout << "Duplicate timeout option specified." << endl;                          cout << "Duplicate shutdown option specified." << endl;
                         exit(0);                         exit(0);
                     }                     }
  
                     timeoutOption = true;                      shutdownOption = true;
   
                     if (i + 1 < argc)  
                     {  
                         // get timeout value  
                         timeoutStr.assign(argv[i + 1]);  
   
                         // validate timeout value string  
                         char* tmp = timeoutStr.allocateCString();  
                         char* end = 0;  
                         timeoutValue  = strtol(tmp, &end, 10);  
   
                         if (!end || *end != '\0')  
                         {  
                             cout << "invalid timeout value specified: ";  
                             cout << timeoutStr << endl;  
                             delete [] tmp;  
                             exit(0);  
                         }  
                     }  
                     else  
                     {  
                         cout << "Missing argument for option -";  
                         cout << option << endl;  
                         exit(0);  
                     }  
  
                     // remove the option from the command line                     // remove the option from the command line
                     memmove(&argv[i], &argv[i + 2], (argc-i-1) * sizeof(char*));                      memmove(&argv[i], &argv[i + 1], (argc-i) * sizeof(char*));
                     argc -= 2;                      argc--;
                 }                 }
                 else                 else
                     i++;                     i++;
Line 513 
Line 530 
         exit(1);         exit(1);
     }     }
  
   
     try     try
     {     {
         //         //
Line 573 
Line 589 
         // Might be more logical to clean before set.         // Might be more logical to clean before set.
         // ATTN: Need tool to completely disable logging.         // ATTN: Need tool to completely disable logging.
  
   #ifndef PEGASUS_OS_HPUX
         Logger::setHomeDirectory(logsDirectory);         Logger::setHomeDirectory(logsDirectory);
   #endif
  
         //         //
         // Check to see if we need to shutdown CIMOM         // Check to see if we need to shutdown CIMOM
         //         //
         if (shutdownOption)         if (shutdownOption)
         {         {
             //              String configTimeout =
             // if timeout was specified, validate the timeout value                  configManager->getCurrentValue("shutdownTimeout");
             //              timeoutValue = strtol(configTimeout.getCString(), (char **)0, 10);
             if (timeoutOption)  
             {              shutdownCIMOM(timeoutValue);
                 Boolean valid = configManager->validatePropertyValue(  
                                              PROPERTY_TIMEOUT,  
                                              timeoutStr);  
                 if (!valid)  
                 {  
                     cout << "Invalid timeout value specified: " << timeoutValue;  
                     cout << endl;  
                     exit(1);  
                 }  
             }  
  
             shutdownCIMOM(forceOption, timeoutValue);              cout << "CIM Server stopped." << endl;
             cout << "Pegasus CIM Server terminated." << endl;  
             exit(0);             exit(0);
         }         }
  
         //         //
         // Grab the port option:          // Get the port numbers
         //         //
  
         portOption = configManager->getCurrentValue("port");          httpPort = configManager->getCurrentValue("httpPort");
  
         //          httpsPort = configManager->getCurrentValue("httpsPort");
         // Check the trace options and set global variable  
         //  
   
         if (String::equal(configManager->getCurrentValue("trace"), "true"))  
         {  
             pegasusIOTrace = true;  
             cout << "Trace Set" << endl;  
         }  
  
         // Leave this in until people get familiar with the logs.         // Leave this in until people get familiar with the logs.
   #ifndef PEGASUS_OS_HPUX
         cout << "Logs Directory = " << logsDirectory << endl;         cout << "Logs Directory = " << logsDirectory << endl;
   #endif
  
         if (String::equal(configManager->getCurrentValue("cleanlogs"), "true"))         if (String::equal(configManager->getCurrentValue("cleanlogs"), "true"))
         {         {
Line 640 
Line 641 
         cout << "Error: " << e.getMessage() << endl;         cout << "Error: " << e.getMessage() << endl;
     }     }
  
     char* address = portOption.allocateCString();      Uint32 portNumber;
   
       char address[32];
   
       if (useSSL)
       {
           char* end = 0;
           CString portString = httpsPort.getCString();
           Uint32 port = strtol(portString, &end, 10);
           assert(end != 0 && *end == '\0');
   
           //
           // Look up the WBEM-HTTPS port number
           //
           portNumber = System::lookupPort(WBEM_HTTPS_SERVICE_NAME, port);
           sprintf(address, "%u", portNumber);
       }
       else
       {
           char* end = 0;
           CString portString = httpPort.getCString();
           Uint32 port = strtol(portString, &end, 10);
           assert(end != 0 && *end == '\0');
   
           //
           // Look up the WBEM-HTTP port number
           //
           portNumber = System::lookupPort(WBEM_HTTP_SERVICE_NAME, port);
           sprintf(address, "%u", portNumber);
       }
  
     // Put out startup up message.     // Put out startup up message.
   #ifndef PEGASUS_OS_HPUX
     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..."      cout <<"Starting..."
          << (pegasusIOTrace ? " Tracing to Display ": " ")  
          << (pegasusIOLog ? " Tracing to Log ": " ")          << (pegasusIOLog ? " Tracing to Log ": " ")
          << (useSLP ? " SLP reg. " : " No SLP ")          << (useSLP ? " SLP reg. " : " No SLP ")
          << (useSSL ? " Use SSL " : " No SSL ")          << (useSSL ? " Use SSL " : " No SSL ")
         << endl;         << endl;
   #endif
     // Put server start message to the logger  
     Logger::put(Logger::STANDARD_LOG, "CIMServer", Logger::INFORMATION,  
         "Start $0 $1 port $2 $3 $4 $5",  
                 PEGASUS_NAME,  
                 PEGASUS_VERSION,  
                 address,  
                 (pegasusIOTrace ? " Tracing": " "),  
                 (useSLP ? " SLP on " : " SLP off "),  
                 (useSSL ? " Use SSL " : " No SSL "));  
  
     // do we need to run as a daemon ?     // do we need to run as a daemon ?
     if (daemonOption)     if (daemonOption)
Line 670 
Line 691 
           exit(-1);           exit(-1);
     }     }
  
   #ifdef PEGASUS_OS_OS400
       // Special server initialization code for OS/400.
       if (cimserver_initialize() != 0)
       {
          // do some logging here!
          exit(-1);
       }
   #endif
   
   #ifdef PEGASUS_OS_HPUX
       umask(S_IWGRP|S_IWOTH);
   #endif
   
     // try loop to bind the address, and run the server     // try loop to bind the address, and run the server
     try     try
     {     {
Line 678 
Line 712 
         String serviceURL;         String serviceURL;
         serviceURL.assign("service:cim.pegasus://");         serviceURL.assign("service:cim.pegasus://");
         String host_name = slp_get_host_name();         String host_name = slp_get_host_name();
         serviceURL += host_name;          serviceURL.append(host_name);
         serviceURL += ":";          serviceURL.append(":");
         serviceURL += address;          serviceURL.append(address);
         char *url = serviceURL.allocateCString();  
         //      free(host_name);  
 #endif #endif
  
         Monitor monitor;          Monitor monitor(true);
         CIMServer server(&monitor, useSSL);         CIMServer server(&monitor, useSSL);
  
         // bind throws an exception if the bind fails         // bind throws an exception if the bind fails
 #ifdef PEGASUS_LOCAL_DOMAIN_SOCKET #ifdef PEGASUS_LOCAL_DOMAIN_SOCKET
         cout << "Binding to domain socket" << endl;         cout << "Binding to domain socket" << endl;
 #else  #elif !defined(PEGASUS_OS_HPUX)
         cout << "Binding to " << address << endl;         cout << "Binding to " << address << endl;
 #endif #endif
  
         char* end = 0;  
         long portNumber = strtol(address, &end, 10);  
         assert(end != 0 && *end == '\0');  
         server.bind(portNumber);         server.bind(portNumber);
  
         delete [] address;          // notify parent process to terminate so user knows that cimserver
           // is ready to serve CIM requests.
           notify_parent();
  
         time_t last = 0;         time_t last = 0;
  
   #if defined(PEGASUS_OS_HPUX)
           //
           // create a file to indicate that the cimserver has started and
           // save the process id of the cimserver process in the file
           //
   
           // remove the old file if it exists
           System::removeFile(fname);
   
           // open the file
           FILE *pid_file = fopen(fname, "w");
           if (pid_file)
           {
               // save the pid in the file
               fprintf(pid_file, "%ld\n", (long)server_pid);
               fclose(pid_file);
           }
   #endif
   #ifndef PEGASUS_OS_HPUX
           cout << "Started. " << endl;
   #endif
   
           // Put server started message to the logger
   #ifdef PEGASUS_OS_HPUX
           Logger::put(Logger::STANDARD_LOG, "CIMServer", Logger::INFORMATION,
                       "Started $0 version $1 on port $2.",
                       PLATFORM_PRODUCT_NAME, PLATFORM_PRODUCT_VERSION, address);
   #else
           Logger::put(Logger::STANDARD_LOG, "CIMServer", Logger::INFORMATION,
                       "Started $0 version $1 on port $2.",
                       PEGASUS_NAME, PEGASUS_VERSION, address);
   #endif
   
   
         //         //
         // Loop to call CIMServer's runForever() method until CIMServer         // Loop to call CIMServer's runForever() method until CIMServer
         // has been shutdown         // has been shutdown
Line 715 
Line 780 
           {           {
             if(  (time(NULL) - last ) > 60 )             if(  (time(NULL) - last ) > 60 )
             {             {
               if( discovery != NULL && url != NULL )                if( discovery != NULL && serviceURL.size() )
                 discovery->srv_reg_all(url,                  discovery->srv_reg_all(serviceURL.getCString(),
                                        "(namespace=root/cimv2)",                                        "(namespace=root/cimv2)",
                                        "service:cim.pegasus",                                        "service:cim.pegasus",
                                        "DEFAULT",                                        "DEFAULT",
Line 730 
Line 795 
           server.runForever();           server.runForever();
         }         }
  
         // This statement is unrechable!  
         //         //
         // Logger::put(Logger::STANDARD_LOG, "CIMServer", Logger::INFORMATION,          // normal termination
         //   "Normal Termination");          //
           // Put server shutdown message to the logger
           Logger::put(Logger::STANDARD_LOG, "CIMServer", Logger::INFORMATION,
               "$0 stopped.", PEGASUS_NAME);
   
   #if defined(PEGASUS_OS_HPUX)
           //
           // close the file created at startup time to indicate that the
           // cimserver has terminated normally.
           //
           FileSystem::removeFile(CIMSERVERSTART_FILE);
   #endif
     }     }
     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);
           return 1;
     }     }
  
     return 0;     return 0;


Legend:
Removed from v.1.44  
changed lines
  Added in v.1.74

No CVS admin address has been configured
Powered by
ViewCVS 0.9.2