(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.16 and 1.17

version 1.16, 2001/06/05 12:52:33 version 1.17, 2001/06/07 12:24:21
Line 9 
Line 9 
 // and/or sell copies of the Software, and to permit persons to whom the // and/or sell copies of the Software, and to permit persons to whom the
 // Software is furnished to do so, subject to the following conditions: // Software is furnished to do so, subject to the following conditions:
 // //
   // The above copyright notice and this permission notice shall be included in
   // all copies or substantial portions of the Software.
   //
   //
 // THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR // THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 // IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, // IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 // FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL // FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
Line 21 
Line 25 
 // //
 // Author: Mike Brasher (mbrasher@bmc.com) // Author: Mike Brasher (mbrasher@bmc.com)
 // //
   // Modified By: Mike Day (mdday@us.ibm.com)
   =======
 // Modified By: Karl Schopmeyer (k.schopmeyer@opengroup.org) // Modified By: Karl Schopmeyer (k.schopmeyer@opengroup.org)
 // //
 //%///////////////////////////////////////////////////////////////////////////// //%/////////////////////////////////////////////////////////////////////////////
  
   
   //////////////////////////////////////////////////////////////////////
   //
   // Notes on deamon operation (Unix) and service operation (Win 32):
   //
   // To run pegasus as a daemon on Unix platforms, use the -d option:
   //
   // cimserver -d
   //
   // The -d option has no effect on windows operation.
   //
   // To run pegasus as an NT service, there are FOUR  different possibilities:
   //
   // To INSTALL the Pegasus service,
   //
   // cimserver -install
   //
   // To REMOVE the Pegasus service,
   //
   // cimserver -remove
   //
   // To START the Pegasus service,
   //
   // net start cimserver
   //
   // To STOP the Pegasus service,
   //
   // net stop cimserver
   //
   // Alternatively, you can use the windows service manager. Pegasus shows up
   // in the service database as "Pegasus CIM Object Manager"
   //
   // Mike Day, mdday@us.ibm.com
   //
   //////////////////////////////////////////////////////////////////////
   
   
 #include <iostream> #include <iostream>
 #include <cstdlib> #include <cstdlib>
 #include <Pegasus/Common/FileSystem.h> #include <Pegasus/Common/FileSystem.h>
Line 36 
Line 79 
 #include <Pegasus/Common/Logger.h> #include <Pegasus/Common/Logger.h>
 #include <Pegasus/Common/System.h> #include <Pegasus/Common/System.h>
  
 PEGASUS_USING_PEGASUS;  
 PEGASUS_USING_STD;  
  
   #if defined(PEGASUS_OS_TYPE_WINDOWS)
   # include "cimserver_windows.cpp"
   #elif defined(PEGASUS_OS_TYPE_UNIX)
   # include "cimserver_unix.cpp"
   #else
   # error "Unsupported platform"
   #endif
  
   PEGASUS_USING_PEGASUS;
   PEGASUS_USING_STD;
  
 void GetEnvironmentVariables( void GetEnvironmentVariables(
     const char* arg0,     const char* arg0,
Line 79 
Line 129 
         {"options", "false", false, Option::BOOLEAN, 0, 0, "options",         {"options", "false", false, Option::BOOLEAN, 0, 0, "options",
                         " Displays the settings of the Options "},                         " Displays the settings of the Options "},
         {"severity", "ALL", false, Option::STRING, 0, 0, "s",         {"severity", "ALL", false, Option::STRING, 0, 0, "s",
   
                     "Sets the severity level that will be logged "},                     "Sets the severity level that will be logged "},
         {"logs", "ALL", false, Option::STRING, 0, 0, "X",         {"logs", "ALL", false, Option::STRING, 0, 0, "X",
                         "Not Used "},                         "Not Used "},
           {"daemon", "false", false, Option::BOOLEAN, 0, 0, "d",
                           "Detach Pegasus from the console and run it in the background "},
         {"logdir", "./logs", false, Option::STRING, 0, 0, "logdir",         {"logdir", "./logs", false, Option::STRING, 0, 0, "logdir",
                         "Directory for log files"},                         "Directory for log files"},
         {"cleanlogs", "false", false, Option::BOOLEAN, 0, 0, "clean",         {"cleanlogs", "false", false, Option::BOOLEAN, 0, 0, "clean",
Line 92 
Line 145 
                         "Displays Pegasus Version "},                         "Displays Pegasus Version "},
         {"help", "false", false, Option::BOOLEAN, 0, 0, "h",         {"help", "false", false, Option::BOOLEAN, 0, 0, "h",
                     "Prints help message with command line options "},                     "Prints help message with command line options "},
           {"install", "false", false, Option::BOOLEAN, 0, 0, "install",
                       "Installs Pegasus as a Windows NT Service "},
           {"remove", "false", false, Option::BOOLEAN, 0, 0, "remove",
                       "Removes Pegasus as a Windows NT Service "},
         {"debug", "false", false, Option::BOOLEAN, 0, 0, "d",         {"debug", "false", false, Option::BOOLEAN, 0, 0, "d",
                         "Not Used "}                         "Not Used "}
     };     };
Line 105 
Line 162 
  
     if (FileSystem::exists(configFile))     if (FileSystem::exists(configFile))
         om.mergeFile(configFile);         om.mergeFile(configFile);
       if(argc && argv != NULL)
     om.mergeCommandLine(argc, argv);     om.mergeCommandLine(argc, argv);
  
     om.checkRequiredOptions();     om.checkRequiredOptions();
Line 129 
Line 186 
 ////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////
 int main(int argc, char** argv) int main(int argc, char** argv)
 { {
   
       // on Windows NT if there are no command-line options, run as a service
       if (argc == 1 )
         cim_server_service(argc, argv) ;
   
     // Get environment variables:     // Get environment variables:
  
     String pegasusHome;     String pegasusHome;
   
     GetEnvironmentVariables(argv[0], pegasusHome);     GetEnvironmentVariables(argv[0], pegasusHome);
  
     // Get options (from command line and from configuration file); this     // Get options (from command line and from configuration file); this
Line 164 
Line 227 
         exit(1);         exit(1);
     }     }
  
       // Check to see if we should (can) install as a NT service
   
       String installOption;
       if(om.lookupValue("install", installOption) && installOption == "true")
         {
           if( 0 != cimserver_install_nt_service( pegasusHome ))
             cout << "\nPegasus installed as NT Service";
           exit(0);
         }
   
       // Check to see if we should (can) remove Pegasus as an NT service
   
       String removeOption;
       if(om.lookupValue("remove", removeOption) && removeOption == "true")
         {
           if( 0 != cimserver_remove_nt_service() )
             cout << "\nPegasus removed as NT Service";
           exit(0);
   
         }
   
     // Check to see if user asked for the version (-v otpion):     // Check to see if user asked for the version (-v otpion):
  
     String versionOption;     String versionOption;
Line 249 
Line 333 
                 address,                 address,
                 (pegasusIOTrace ? " Tracing": " "));                 (pegasusIOTrace ? " Tracing": " "));
  
       // do we need to run as a daemon ?
       String daemonOption;
       if(om.lookupValue("daemon", daemonOption) && daemonOption == "true")
         {
           if(-1 == cimserver_fork())
             exit(-1);
         }
   
   
     // try loop to bind the address, and run the server     // try loop to bind the address, and run the server
     try     try
     {     {
Line 274 
Line 367 
  
     return 0;     return 0;
 } }
   

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