(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.62 and 1.63

version 1.62, 2002/06/07 15:17:15 version 1.63, 2002/07/19 20:42:55
Line 141 
Line 141 
 #endif #endif
  
 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 213 
Line 213 
     usage.append ("                - sets CIM Server configuration property\n");     usage.append ("                - sets CIM Server configuration property\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 238 
Line 242 
         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  
         //         //
         client.setTimeOut( (timeoutValue+2)*1000 );          client.setTimeOut(2000);
     }     }
     catch(CIMClientException& e)     catch(CIMClientException& e)
     {     {
Line 286 
Line 288 
     catch(CIMClientCIMException& e)     catch(CIMClientCIMException& 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);
           }
         exit(1);         exit(1);
     }     }
     catch(CIMClientException& e)     catch(CIMClientException& e)
Line 299 
Line 309 
         //         //
         // 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);
               running = isCIMServerRunning();
               maxWaitTime = maxWaitTime - 1;
           }
   
           if (running)
           {
         cimserver_kill();         cimserver_kill();
     }     }
       }
     catch(Exception& e)     catch(Exception& e)
     {     {
         PEGASUS_STD(cerr) << "Error occurred while stopping the CIM Server: ";         PEGASUS_STD(cerr) << "Error occurred while stopping the CIM Server: ";
Line 366 
Line 398 
                 //                 //
                 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 377 
Line 413 
                     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 392 
Line 429 
                     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 504 
Line 542 
         if (String::equal(configManager->getCurrentValue("daemon"), "true"))         if (String::equal(configManager->getCurrentValue("daemon"), "true"))
         {         {
             daemonOption = true;             daemonOption = true;
             // do we need to run as a daemon ?  
             if (daemonOption)  
             {  
                if(-1 == cimserver_fork())  
                   exit(-1);  
             }  
         }         }
  
         //         //
Line 621 
Line 653 
     }     }
  
     // 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 629 
Line 662 
          << (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 ?
       if (daemonOption)
       {
           if(-1 == cimserver_fork())
             exit(-1);
       }
  
   #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 653 
Line 696 
         // 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 679 
Line 722 
             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
  
  
         //         //

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