(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.57 and 1.70

version 1.57, 2002/06/01 00:25:05 version 1.70, 2002/09/03 13:31:31
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 39 
Line 40 
 // //
 // 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 [-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 82 
  
  
 #include <Pegasus/Common/Config.h> #include <Pegasus/Common/Config.h>
 #include <Pegasus/suballoc/suballoc.h>  #include <Pegasus/Common/Constants.h>
 #include <iostream> #include <iostream>
 #include <cassert> #include <cassert>
 #include <cstdlib> #include <cstdlib>
Line 100 
Line 106 
 #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 129 
Line 139 
  
 static const char OPTION_SHUTDOWN    = 's'; static const char OPTION_SHUTDOWN    = 's';
  
 static const char OPTION_FORCE       = 'f';  
   
 static const char OPTION_TIMEOUT     = 't';  
   
 #if defined(PEGASUS_OS_HPUX) #if defined(PEGASUS_OS_HPUX)
 static const char OPTION_BINDVERBOSE = 'X'; static const char OPTION_BINDVERBOSE = 'X';
 #endif #endif
  
 static const String NAMESPACE = "root/PG_Internal";  
 static const String CLASSNAME_SHUTDOWNSERVICE = "PG_ShutdownService";  
 static const String PROPERTY_TIMEOUT = "shutdownTimeout"; static const String PROPERTY_TIMEOUT = "shutdownTimeout";
 static const String CIMSERVERSTART_FILE = "/etc/wbem/cimserver_start.conf";  static const String CIMSERVERSTART_FILE = "/etc/opt/wbem/cimserver_start.conf";
  
 ConfigManager*    configManager; ConfigManager*    configManager;
  
Line 198 
Line 202 
     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 ("    -d          - runs pegasus as a daemon\n");  #endif
     usage.append ("    -s [-t timeout] \n");  #if defined(PEGASUS_OS_TYPE_WINDOWS)
     usage.append ("                - shuts down pegasus\n");  
 #if !defined(PEGASUS_OS_HPUX)  
     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");  
     usage.append ("    -SSL        - uses SSL\n\n");  
 #endif #endif
     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;
 } }
Line 241 
Line 245 
         client.connectLocal();         client.connectLocal();
  
         //         //
         // set client timeout to 2 seconds more than the shutdown timeout          // set client timeout to 2 seconds
         // so that the command client does not timeout before the cimserver  
         // terminates  
         //         //
         Uint32 clientTimeout;          client.setTimeOut(2000);
         if (timeoutValue == 0)  
         {  
             String configTimeout =  
                 configManager->getCurrentValue("shutdownTimeout");  
            ArrayDestroyer<char> timeoutCString(configTimeout.allocateCString());  
             clientTimeout =  
                 ((strtol(timeoutCString.getPointer(), (char **)0,10))+2)*1000;  
         }  
         else  
         {  
             clientTimeout = (timeoutValue + 2)*1000;  
         }         }
       catch(Exception& e)
         client.setTimeOut(clientTimeout);  
     }  
     catch(CIMClientException& e)  
     {     {
         PEGASUS_STD(cerr) << "Unable to connect to CIM Server." << PEGASUS_STD(endl);         PEGASUS_STD(cerr) << "Unable to connect to CIM Server." << PEGASUS_STD(endl);
         PEGASUS_STD(cerr) << "CIM Server may not be running." << PEGASUS_STD(endl);         PEGASUS_STD(cerr) << "CIM Server may not be running." << PEGASUS_STD(endl);
   #ifdef PEGASUS_OS_OS400
           // The server job may still be active but not responding.
           // Kill the job if it exists.
           cimserver_kill();
   #endif
         exit(0);         exit(0);
     }     }
  
Line 275 
Line 268 
         //         //
         String referenceStr = "//";         String referenceStr = "//";
         referenceStr.append(hostStr);         referenceStr.append(hostStr);
         referenceStr.append(PEGASUS_NAMESPACENAME_CIMV2);          referenceStr.append("/");
           referenceStr.append(PEGASUS_NAMESPACENAME_SHUTDOWN);
         referenceStr.append(":");         referenceStr.append(":");
         referenceStr.append(PEGASUS_CLASSNAME_SHUTDOWN);         referenceStr.append(PEGASUS_CLASSNAME_SHUTDOWN);
         CIMObjectPath reference(referenceStr);         CIMObjectPath reference(referenceStr);
Line 294 
Line 288 
             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);
     }     }
     catch(CIMClientCIMException& e)      catch(CIMException& e)
     {     {
         PEGASUS_STD(cerr) << "Failed to shutdown server: ";         PEGASUS_STD(cerr) << "Failed to shutdown server: ";
           if (e.getCode() == CIM_ERR_INVALID_NAMESPACE)
           {
               PEGASUS_STD(cerr) << "The repository may be empty.";
               PEGASUS_STD(cerr) << PEGASUS_STD(endl);
           }
           else
           {
         PEGASUS_STD(cerr) << e.getMessage() << PEGASUS_STD(endl);         PEGASUS_STD(cerr) << e.getMessage() << PEGASUS_STD(endl);
           }
   #ifdef PEGASUS_OS_OS400
           // Kill the server job.
           cimserver_kill();
   #endif
         exit(1);         exit(1);
     }     }
     catch(CIMClientException& e)      catch(Exception& e)
     {     {
         //         //
         // This may mean the CIM Server has been terminated and returns a         // This may mean the CIM Server has been terminated and returns a
Line 316 
Line 322 
         //         //
         // give CIM Server some time to finish up         // 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);         System::sleep(1);
         cimserver_kill();              running = isCIMServerRunning();
               maxWaitTime = maxWaitTime - 1;
     }     }
     catch(Exception& e)  
           if (running)
     {     {
         PEGASUS_STD(cerr) << "Error occurred while stopping the CIM Server: ";              cimserver_kill();
         PEGASUS_STD(cerr) << e.getMessage() << PEGASUS_STD(endl);          }
         exit(1);  
     }     }
       //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 344 
Line 372 
     Boolean useSSL = false;     Boolean useSSL = false;
     Boolean daemonOption = false;     Boolean daemonOption = false;
     Boolean shutdownOption = false;     Boolean shutdownOption = false;
     Boolean timeoutOption = false;      Uint32 timeoutValue  = 0;
     String  timeoutStr  = String::EMPTY;  
     long timeoutValue  = 0;  #ifdef PEGASUS_OS_OS400
       // Initialize Pegasus home to the shipped OS/400 directory.
       pegasusHome = OS400_DEFAULT_PEGASUS_HOME;
   #endif
  
     //     //
     // Get environment variables:     // Get environment variables:
Line 368 
Line 399 
     }     }
     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 385 
Line 416 
                 //                 //
                 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 396 
Line 431 
                     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 411 
Line 447 
                     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) #if defined(PEGASUS_OS_HPUX)
                 //                 //
                 // Check to see if user asked for the version (-X option):                 // Check to see if user asked for the version (-X option):
Line 430 
Line 467 
                 //                 //
                 else if (*option == OPTION_SHUTDOWN)                 else if (*option == OPTION_SHUTDOWN)
                 {                 {
   
                     //                     //
                     // check to see if user is root                     // check to see if user is root
                     //                     //
   #ifndef PEGASUS_OS_OS400
                     if (!System::isPrivilegedUser(System::getEffectiveUserName()))                     if (!System::isPrivilegedUser(System::getEffectiveUserName()))
                     {                     {
                         cout << "You must have superuser privilege to run ";                         cout << "You must have superuser privilege to run ";
                         cout << "cimserver." << endl;                         cout << "cimserver." << endl;
                         exit(0);                         exit(0);
                     }                     }
   #endif
  
                     //                     //
                     // Check to see if shutdown has already been specified:                     // Check to see if shutdown has already been specified:
Line 456 
Line 494 
                     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_TIMEOUT)  
                 {  
                     //  
                     // Check to see if shutdown has been specified:  
                     //  
                     if (!shutdownOption)  
                     {  
                         cout << "Invalid option -" << option << endl;  
                         exit(0);  
                     }  
   
                     if (timeoutOption)  
                     {  
                         cout << "Duplicate timeout option specified." << endl;  
                         exit(0);  
                     }  
   
                     timeoutOption = 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  
                     memmove(&argv[i], &argv[i + 2], (argc-i-1) * sizeof(char*));  
                     argc -= 2;  
                 }  
                 else                 else
                     i++;                     i++;
             }             }
Line 537 
Line 527 
         exit(1);         exit(1);
     }     }
  
   
     try     try
     {     {
         //         //
Line 606 
Line 595 
         //         //
         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)  
             {  
                 Boolean valid = configManager->validatePropertyValue(  
                                              PROPERTY_TIMEOUT,  
                                              timeoutStr);  
                 if (!valid)  
                 {  
                     cout << "Invalid timeout value specified: " << timeoutValue;  
                     cout << endl;  
                     exit(1);  
                 }  
             }  
  
             shutdownCIMOM(timeoutValue);             shutdownCIMOM(timeoutValue);
  
             cout << "Pegasus CIM Server stopped." << endl;              cout << "CIM Server stopped." << endl;
             exit(0);             exit(0);
         }         }
  
Line 667 
Line 644 
  
     if (useSSL)     if (useSSL)
     {     {
         char* p = httpsPort.allocateCString();  
         char* end = 0;         char* end = 0;
         Uint32 port = strtol(p, &end, 10);          CString portString = httpsPort.getCString();
           Uint32 port = strtol(portString, &end, 10);
         assert(end != 0 && *end == '\0');         assert(end != 0 && *end == '\0');
         delete [] p;  
  
         //         //
         // Look up the WBEM-HTTPS port number         // Look up the WBEM-HTTPS port number
Line 681 
Line 657 
     }     }
     else     else
     {     {
         char* p = httpPort.allocateCString();  
         char* end = 0;         char* end = 0;
         Uint32 port = strtol(p, &end, 10);          CString portString = httpPort.getCString();
           Uint32 port = strtol(portString, &end, 10);
         assert(end != 0 && *end == '\0');         assert(end != 0 && *end == '\0');
         delete [] p;  
  
         //         //
         // Look up the WBEM-HTTP port number         // Look up the WBEM-HTTP port number
Line 695 
Line 670 
     }     }
  
     // 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;
Line 703 
Line 679 
          << (useSLP ? " SLP reg. " : " No SLP ")          << (useSLP ? " SLP reg. " : " No SLP ")
          << (useSSL ? " Use SSL " : " No SSL ")          << (useSSL ? " Use SSL " : " No SSL ")
         << endl;         << endl;
   #endif
  
     // do we need to run as a daemon ?     // do we need to run as a daemon ?
     if (daemonOption)     if (daemonOption)
Line 711 
Line 688 
           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 719 
Line 709 
         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
  
Line 758 
Line 746 
             fclose(pid_file);             fclose(pid_file);
         }         }
 #endif #endif
   #ifndef PEGASUS_OS_HPUX
         cout << "Started. " << endl;         cout << "Started. " << endl;
   #endif
  
         // Put server started message to the logger         // 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,         Logger::put(Logger::STANDARD_LOG, "CIMServer", Logger::INFORMATION,
                     "Started $0 version $1 on port $2.",                     "Started $0 version $1 on port $2.",
                     PEGASUS_NAME, PEGASUS_VERSION, address);                     PEGASUS_NAME, PEGASUS_VERSION, address);
   #endif
  
  
         //         //
Line 777 
Line 773 
           {           {
             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 809 
Line 805 
     }     }
     catch(Exception& e)     catch(Exception& e)
     {     {
         Logger::put(Logger::STANDARD_LOG, "CIMServer", Logger::INFORMATION,  
             "$0 .Abnormal Termination.", e.getMessage());  
   
         PEGASUS_STD(cerr) << "Error: " << e.getMessage() << PEGASUS_STD(endl);         PEGASUS_STD(cerr) << "Error: " << e.getMessage() << PEGASUS_STD(endl);
         return 1;         return 1;
     }     }


Legend:
Removed from v.1.57  
changed lines
  Added in v.1.70

No CVS admin address has been configured
Powered by
ViewCVS 0.9.2