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

Diff for /pegasus/src/Pegasus/Common/Logger.cpp between version 1.15 and 1.16

version 1.15, 2001/07/18 16:39:27 version 1.16, 2002/05/09 21:08:55
Line 22 
Line 22 
 // //
 // Author: Mike Brasher (mbrasher@bmc.com) // Author: Mike Brasher (mbrasher@bmc.com)
 // //
 // Modified By:  // Modified By: Sushma Fernandes (Hewlett-Packard Company)
   //              sushma_fernandes@hp.com
 // //
 //%///////////////////////////////////////////////////////////////////////////// //%/////////////////////////////////////////////////////////////////////////////
  
Line 31 
Line 32 
 #include "System.h" #include "System.h"
 #include "Logger.h" #include "Logger.h"
 #include "System.h" #include "System.h"
   #include "Destroyer.h"
   
   #ifdef PEGASUS_OS_HPUX
       #include <syslog.h>
   #endif
  
 PEGASUS_USING_STD; PEGASUS_USING_STD;
  
Line 44 
Line 50 
  
 LoggerRep* Logger::_rep = 0; LoggerRep* Logger::_rep = 0;
 String Logger::_homeDirectory = "."; String Logger::_homeDirectory = ".";
   
   // FUTURE-SF-P3-20020517 : This may need to be configurable. At least needs
   // to be set to 0xFF by default always.
 Uint32 Logger::_severityMask = 0xFF;      // Set all on by default Uint32 Logger::_severityMask = 0xFF;      // Set all on by default
   
 Uint32 Logger::_writeControlMask = 0xF;   // Set all on by default Uint32 Logger::_writeControlMask = 0xF;   // Set all on by default
  
 /* _allocLogFileName. Allocates the name from a name set. /* _allocLogFileName. Allocates the name from a name set.
Line 174 
Line 184 
         // NUM_LEVELS = 5         // NUM_LEVELS = 5
         int sizeSvNames = sizeof(svNames) / sizeof(svNames[0]) - 1;         int sizeSvNames = sizeof(svNames) / sizeof(svNames[0]) - 1;
  
           String logMsg = Formatter::format(formatString,
                   arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9);
           ArrayDestroyer<char> logMsgCString(logMsg.allocateCString());
   
           #ifdef PEGASUS_OS_HPUX
               // FUTURE-SF-P3-20020517 : Use the Syslog on HP-UX. Eventually only
               // certain messages will go to the Syslog and others to the
               // Pegasus Logger.
               Uint32 syslogLevel = LOG_DEBUG;
   
               // Map the log levels.
               if (severity & Logger::TRACE) syslogLevel =       LOG_DEBUG;
               if (severity & Logger::INFORMATION) syslogLevel = LOG_INFO;
               if (severity & Logger::WARNING) syslogLevel =     LOG_WARNING;
               if (severity & Logger::SEVERE) syslogLevel =      LOG_ERR;
               if (severity & Logger::FATAL) syslogLevel =       LOG_CRIT;
   
               // Open the syslog.
               // Ignore the systemId and open the log as cimserver
               openlog("cimserver", LOG_PID|LOG_CONS, LOG_DAEMON);
   
               // Log the message
               syslog(syslogLevel, "%s", logMsgCString.getPointer());
   
               // Close the syslog.
               closelog();
          #else
         const char* tmp = "";         const char* tmp = "";
         if (severity & Logger::TRACE) tmp =       "TRACE   ";         if (severity & Logger::TRACE) tmp =       "TRACE   ";
         if (severity & Logger::INFORMATION) tmp = "INFO    ";         if (severity & Logger::INFORMATION) tmp = "INFO    ";
         if (severity & Logger::WARNING) tmp =     "WARNING ";         if (severity & Logger::WARNING) tmp =     "WARNING ";
         if (severity & Logger::SEVERE) tmp =      "SEVERE  ";         if (severity & Logger::SEVERE) tmp =      "SEVERE  ";
         if (severity & Logger::FATAL) tmp =       "FATAL   ";         if (severity & Logger::FATAL) tmp =       "FATAL   ";
                   _rep->logOf(logFileType) << System::getCurrentASCIITime()
        _rep->logOf(logFileType) << System::getCurrentASCIITime() << " " << tmp                   << " " << tmp << logMsgCString.getPointer() << endl;
            << Formatter::format(formatString,         #endif
            arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9) << endl;  
  
     }     }
 } }


Legend:
Removed from v.1.15  
changed lines
  Added in v.1.16

No CVS admin address has been configured
Powered by
ViewCVS 0.9.2