(file) Return to CIMServer.cpp CVS log (file) (dir) Up to [Pegasus] / pegasus / src / Pegasus / Server

Diff for /pegasus/src/Pegasus/Server/CIMServer.cpp between version 1.197.4.3 and 1.197.4.4

version 1.197.4.3, 2007/07/03 21:50:08 version 1.197.4.4, 2007/12/14 20:47:56
Line 73 
Line 73 
 # include <Pegasus/Client/CIMClient.h> # include <Pegasus/Client/CIMClient.h>
 #endif #endif
  
 // PEGASUS_SLP_REG_TIMEOUT is the time interval in minute for reregistration with SLP.  // PEGASUS_SLP_REG_TIMEOUT is the time interval in minute for reregistration
   // with SLP.
 #ifdef PEGASUS_SLP_REG_TIMEOUT #ifdef PEGASUS_SLP_REG_TIMEOUT
 #include "SLPAttrib.h" #include "SLPAttrib.h"
 #include <slp/slp_client/src/cmd-utils/slp_client/lslp-common-defs.h> #include <slp/slp_client/src/cmd-utils/slp_client/lslp-common-defs.h>
Line 92 
Line 93 
 #include \ #include \
     <Pegasus/ControlProviders/ConfigSettingProvider/ConfigSettingProvider.h>     <Pegasus/ControlProviders/ConfigSettingProvider/ConfigSettingProvider.h>
 #include <Pegasus/ControlProviders/UserAuthProvider/UserAuthProvider.h> #include <Pegasus/ControlProviders/UserAuthProvider/UserAuthProvider.h>
 #include <Pegasus/ControlProviders/ProviderRegistrationProvider/ProviderRegistrationProvider.h>  #include <Pegasus/ControlProviders/ProviderRegistrationProvider/\
   ProviderRegistrationProvider.h>
 #include <Pegasus/ControlProviders/NamespaceProvider/NamespaceProvider.h> #include <Pegasus/ControlProviders/NamespaceProvider/NamespaceProvider.h>
  
 #ifndef PEGASUS_DISABLE_PERFINST #ifndef PEGASUS_DISABLE_PERFINST
Line 104 
Line 106 
 #endif #endif
  
 #ifndef PEGASUS_DISABLE_CQL #ifndef PEGASUS_DISABLE_CQL
 # include <Pegasus/ControlProviders/QueryCapabilitiesProvider/CIMQueryCapabilitiesProvider.h>  # include <Pegasus/ControlProviders/QueryCapabilitiesProvider/\
   CIMQueryCapabilitiesProvider.h>
 #endif #endif
  
 #if !defined(PEGASUS_DISABLE_PERFINST) || defined(PEGASUS_ENABLE_SLP) #if !defined(PEGASUS_DISABLE_PERFINST) || defined(PEGASUS_ENABLE_SLP)
Line 170 
Line 173 
             sprintf(str_errno2,"%08X",__errno2());             sprintf(str_errno2,"%08X",__errno2());
  
             PEG_TRACE((TRC_SERVER, Tracer::LEVEL2,             PEG_TRACE((TRC_SERVER, Tracer::LEVEL2,
                 "Failed to issue __console() command: %s",strerror(errornumber)));                  "Failed to issue __console() command: %s",
                   strerror(errornumber)));
             Logger::put_l(             Logger::put_l(
                 Logger::ERROR_LOG, "CIM Server", Logger::SEVERE,                 Logger::ERROR_LOG, "CIM Server", Logger::SEVERE,
                 "Server.CIMServer.CONSOLE_ERROR.PEGASUS_OS_ZOS",                 "Server.CIMServer.CONSOLE_ERROR.PEGASUS_OS_ZOS",
Line 244 
Line 248 
     _cimserver = this;     _cimserver = this;
     _init();     _init();
  
       // Get value of idle connection timeout in seconds.
       String idleConnectionConfigTimeout =
           ConfigManager::getInstance()->getCurrentValue("idleConnectionTimeout");
   
       _idleConnectionTimeoutSeconds =
           strtol(idleConnectionConfigTimeout.getCString(), (char**)0, 10);
   
     PEG_METHOD_EXIT();     PEG_METHOD_EXIT();
 } }
  
Line 674 
Line 685 
     if (socketWriteTimeout == 0) socketWriteTimeout = 20;     if (socketWriteTimeout == 0) socketWriteTimeout = 20;
     acceptor->setSocketWriteTimeout(socketWriteTimeout);     acceptor->setSocketWriteTimeout(socketWriteTimeout);
  
       // Set idle connection timeout in seconds.
       acceptor->setIdleConnectionTimeout(_idleConnectionTimeoutSeconds);
   
     _acceptors.append(acceptor);     _acceptors.append(acceptor);
 } }
  
Line 1251 
Line 1265 
  
         _slpRegistrationComplete = true;         _slpRegistrationComplete = true;
  
         Logger::put_l(Logger::STANDARD_LOG, System::CIMSERVER, Logger::INFORMATION,          Logger::put_l(Logger::STANDARD_LOG, System::CIMSERVER,
               Logger::INFORMATION,
             "Pegasus.Server.SLP.SLP_REGISTRATION_INITIATED",             "Pegasus.Server.SLP.SLP_REGISTRATION_INITIATED",
             "SLP Registration Initiated");             "SLP Registration Initiated");
     }     }
Line 1350 
Line 1365 
              {              {
                  Logger::put_l(                  Logger::put_l(
                      Logger::STANDARD_LOG, System::CIMSERVER, Logger::WARNING,                      Logger::STANDARD_LOG, System::CIMSERVER, Logger::WARNING,
                      "Pegasus.Server.SLP.EXTERNAL_SLP_REGISTRATION_FAILED_ERROR",                       "Pegasus.Server.SLP.EXTERNAL_SLP_REGISTRATION_FAILED_ERROR"
                      "CIM Server registration with External SLP Failed.");                       ,"CIM Server registration with External SLP Failed.");
              }              }
  
              if (foundHttpsProtocol &&              if (foundHttpsProtocol &&
Line 1364 
Line 1379 
              {              {
                  Logger::put_l(                  Logger::put_l(
                      Logger::STANDARD_LOG, System::CIMSERVER, Logger::WARNING,                      Logger::STANDARD_LOG, System::CIMSERVER, Logger::WARNING,
                      "Pegasus.Server.SLP.EXTERNAL_SLP_REGISTRATION_FAILED_ERROR",                       "Pegasus.Server.SLP.EXTERNAL_SLP_REGISTRATION_FAILED_ERROR"
                      "CIM Server registration with External SLP Failed.");                       ,"CIM Server registration with External SLP Failed.");
              }              }
          }          }
      }      }

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