tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mt...@apache.org
Subject cvs commit: jakarta-tomcat-connectors/jk/native/common jk_util.c
Date Sun, 12 Dec 2004 15:35:50 GMT
mturk       2004/12/12 07:35:50

  Modified:    jk/native/common jk_util.c
  Log:
  Add warn level checking. Also make emerge the same as error,
  having emerge as type of error. Use info as default log level.
  Thanks Rainer.
  
  Revision  Changes    Path
  1.48      +16 -8     jakarta-tomcat-connectors/jk/native/common/jk_util.c
  
  Index: jk_util.c
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_util.c,v
  retrieving revision 1.47
  retrieving revision 1.48
  diff -u -r1.47 -r1.48
  --- jk_util.c	7 Dec 2004 13:29:55 -0000	1.47
  +++ jk_util.c	12 Dec 2004 15:35:50 -0000	1.48
  @@ -91,7 +91,7 @@
   
   
   static const char *jk_level_werbs[] = {
  -    "[" JK_LOG_TRACE_WERB "] ",
  +    "[" JK_LOG_TRACE_VERB "] ",
       "[" JK_LOG_DEBUG_VERB "] ",
       "[" JK_LOG_INFO_VERB  "]  ",
       "[" JK_LOG_WARNING_VERB  "]  ",
  @@ -172,23 +172,31 @@
   
   int jk_parse_log_level(const char *level)
   {
  +    if (0 == strcasecmp(level, JK_LOG_TRACE_VERB)) {
  +        return JK_LOG_TRACE_LEVEL;
  +    }
  +
  +    if (0 == strcasecmp(level, JK_LOG_DEBUG_VERB)) {
  +        return JK_LOG_DEBUG_LEVEL;
  +    }
  +
       if (0 == strcasecmp(level, JK_LOG_INFO_VERB)) {
           return JK_LOG_INFO_LEVEL;
       }
   
  +    if (0 == strcasecmp(level, JK_LOG_WARNING_VERB)) {
  +        return JK_LOG_WARNING_LEVEL;
  +    }
  +
       if (0 == strcasecmp(level, JK_LOG_ERROR_VERB)) {
           return JK_LOG_ERROR_LEVEL;
       }
   
       if (0 == strcasecmp(level, JK_LOG_EMERG_VERB)) {
  -        return JK_LOG_EMERG_LEVEL;
  -    }
  -
  -    if (0 == strcasecmp(level, JK_LOG_DEBUG_VERB)) {
  -        return JK_LOG_DEBUG_LEVEL;
  +        return JK_LOG_ERROR_LEVEL;
       }
   
  -    return JK_LOG_TRACE_LEVEL;
  +    return JK_LOG_INFO_LEVEL;
   }
   
   int jk_open_file_logger(jk_logger_t **l, const char *file, int level)
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: tomcat-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: tomcat-dev-help@jakarta.apache.org


Mime
View raw message