(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.158 and 1.161

version 1.158, 2005/04/04 21:27:32 version 1.161, 2005/05/05 20:24:31
Line 57 
Line 57 
 // //
 // Modified By: Heather Sterling, IBM (hsterl@us.ibm.com) - PEP#222 // Modified By: Heather Sterling, IBM (hsterl@us.ibm.com) - PEP#222
 // //
   // Modified By: Josephine Eskaline Joyce, IBM (jojustin@in.ibm.com) - Bug#3452
   //
 //%///////////////////////////////////////////////////////////////////////////// //%/////////////////////////////////////////////////////////////////////////////
  
  
Line 492 
Line 494 
                                      "Forced shutdown initiated.");                                      "Forced shutdown initiated.");
             PEGASUS_STD(cerr) << MessageLoader::getMessage(parms) << PEGASUS_STD(endl);             PEGASUS_STD(cerr) << MessageLoader::getMessage(parms) << PEGASUS_STD(endl);
         }         }
            PEGASUS_STD(cerr) << "Exit! " << endl;
         exit(1);         exit(1);
 #endif #endif
     }     }
Line 873 
Line 876 
 #endif #endif
  
     // Make sure at least one connection is enabled     // Make sure at least one connection is enabled
 #ifndef PEGASUS_LOCAL_DOMAIN_SOCKET  #ifdef PEGASUS_DISABLE_LOCAL_DOMAIN_SOCKET
     if (!enableHttpConnection && !enableHttpsConnection)     if (!enableHttpConnection && !enableHttpsConnection)
     {     {
         //l10n         //l10n
Line 911 
Line 914 
         // We put String into Cstring because         // We put String into Cstring because
         // Directory functions only handle Cstring.         // Directory functions only handle Cstring.
         // ATTN-KS: create String based directory functions.         // ATTN-KS: create String based directory functions.
   #if !defined(PEGASUS_USE_SYSLOGS)
                   // When using syslog facility. No files anymore.
         logsDirectory = configManager->getCurrentValue("logdir");         logsDirectory = configManager->getCurrentValue("logdir");
         logsDirectory =         logsDirectory =
         ConfigManager::getHomedPath(configManager->getCurrentValue("logdir"));         ConfigManager::getHomedPath(configManager->getCurrentValue("logdir"));
   #endif
 #ifdef PEGASUS_OS_OS400 #ifdef PEGASUS_OS_OS400
     }  // end if (os400StartupOption == false)     }  // end if (os400StartupOption == false)
 #endif #endif
Line 924 
Line 929 
         // ATTN: Need tool to completely disable logging.         // ATTN: Need tool to completely disable logging.
  
 #if !defined(PEGASUS_OS_HPUX) && !defined(PEGASUS_PLATFORM_LINUX_IA64_GNU) && \ #if !defined(PEGASUS_OS_HPUX) && !defined(PEGASUS_PLATFORM_LINUX_IA64_GNU) && \
 !defined(PEGASUS_OS_OS400)  !defined(PEGASUS_OS_OS400) && !defined(PEGASUS_USE_SYSLOGS)
         Logger::setHomeDirectory(logsDirectory);         Logger::setHomeDirectory(logsDirectory);
 #endif #endif
  
Line 962 
Line 967 
         // Leave this in until people get familiar with the logs.         // Leave this in until people get familiar with the logs.
         //l10n         //l10n
         //cout << "Logs Directory = " << logsDirectory << endl;         //cout << "Logs Directory = " << logsDirectory << endl;
   #if !defined(PEGASUS_USE_SYSLOGS)
         MessageLoaderParms parms("src.Server.cimserver.LOGS_DIRECTORY",         MessageLoaderParms parms("src.Server.cimserver.LOGS_DIRECTORY",
                                  "Logs Directory = ");                                  "Logs Directory = ");
         cout << MessageLoader::getMessage(parms) << logsDirectory << endl;         cout << MessageLoader::getMessage(parms) << logsDirectory << endl;
 #endif #endif
   #endif
     }     }
     catch (UnrecognizedConfigProperty& e)     catch (UnrecognizedConfigProperty& e)
     {     {
Line 1018 
Line 1025 
             portNumberHttps = strtol(portString, &end, 10);             portNumberHttps = strtol(portString, &end, 10);
             if(!(end != 0 && *end == '\0'))             if(!(end != 0 && *end == '\0'))
             {             {
                 PEGASUS_STD(cerr) << "Bad HTTPS Port Value" << PEGASUS_STD(endl);                  InvalidPropertyValue e("httpsPort", httpsPort);
                   cerr << e.getMessage() << endl;
                 exit(1);                 exit(1);
             }             }
         }         }
Line 1044 
Line 1052 
             portNumberHttp = strtol(portString, &end, 10);             portNumberHttp = strtol(portString, &end, 10);
             if(!(end != 0 && *end == '\0'))             if(!(end != 0 && *end == '\0'))
             {             {
                 PEGASUS_STD(cerr) << "Bad HTTP Port Value" << PEGASUS_STD(endl);                  InvalidPropertyValue e("httpPort", httpPort);
                   cerr << e.getMessage() << endl;
                 exit(1);                 exit(1);
             }             }
         }         }
Line 1228 
Line 1237 
                 "Listening on Export HTTPS port $0.", portNumberExportHttps);                 "Listening on Export HTTPS port $0.", portNumberExportHttps);
         }         }
  
 #ifdef PEGASUS_LOCAL_DOMAIN_SOCKET  #ifndef PEGASUS_DISABLE_LOCAL_DOMAIN_SOCKET
         _cimServer->addAcceptor(true, 0, false, false);         _cimServer->addAcceptor(true, 0, false, false);
         //l10n         //l10n
         //Logger::put(Logger::STANDARD_LOG, System::CIMSERVER, Logger::INFORMATION,         //Logger::put(Logger::STANDARD_LOG, System::CIMSERVER, Logger::INFORMATION,
Line 1263 
Line 1272 
             cout << MessageLoader::getMessage(parms) << endl;             cout << MessageLoader::getMessage(parms) << endl;
         }         }
  
 # ifdef PEGASUS_LOCAL_DOMAIN_SOCKET  # ifndef PEGASUS_DISABLE_LOCAL_DOMAIN_SOCKET
         //l10n         //l10n
         //cout << "Listening on local connection socket" << endl;         //cout << "Listening on local connection socket" << endl;
         MessageLoaderParms parms("src.Server.cimserver.LISTENING_ON_LOCAL",         MessageLoaderParms parms("src.Server.cimserver.LISTENING_ON_LOCAL",

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