(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.65 and 1.66

version 1.65, 2002/08/17 00:09:38 version 1.66, 2002/08/23 16:11:21
Line 107 
Line 107 
 #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 250 
Line 254 
     {     {
         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 297 
Line 306 
         {         {
             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(Exception& e)     catch(Exception& e)
Line 361 
Line 374 
     Boolean shutdownOption = false;     Boolean shutdownOption = false;
     Uint32 timeoutValue  = 0;     Uint32 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 671 
Line 689 
           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 #ifdef PEGASUS_OS_HPUX
     umask(S_IWGRP|S_IWOTH);     umask(S_IWGRP|S_IWOTH);
 #endif #endif

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