tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cos...@apache.org
Subject cvs commit: jakarta-tomcat-connectors/jk/native2/common jk_logger_file.c
Date Sun, 02 Dec 2001 01:01:42 GMT
costin      01/12/01 17:01:42

  Modified:    jk/native2/common jk_logger_file.c
  Log:
  The logger will print messages to stdout if it is not opened.
  
  This is usefull for debugging what happens before jk_init() ( the configuration
  stage ).
  
  ( visible with httpd -X )
  
  As soon as we add jk_logger_apache and log to the normal apache log this
  can go away.
  
  Revision  Changes    Path
  1.2       +26 -26    jakarta-tomcat-connectors/jk/native2/common/jk_logger_file.c
  
  Index: jk_logger_file.c
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_logger_file.c,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- jk_logger_file.c	2001/12/01 22:36:49	1.1
  +++ jk_logger_file.c	2001/12/02 01:01:42	1.2
  @@ -59,7 +59,7 @@
    * Description: Utility functions (mainly configuration)                   *
    * Author:      Gal Shachor <shachor@il.ibm.com>                           *
    * Author:      Henri Gomez <hgomez@slib.fr>                               *
  - * Version:     $Revision: 1.1 $                                           *
  + * Version:     $Revision: 1.2 $                                           *
    ***************************************************************************/
   
   #include "jk_util.h"
  @@ -73,6 +73,10 @@
   #define HUGE_BUFFER_SIZE (8*1024)
   #define LOG_LINE_SIZE    (1024)
   
  +int JK_METHOD jk_logger_file_factory(jk_env_t *env, void **result,
  +                                     char *type, char *name);
  +
  +
   /* 
    * define the log format, we're using by default the one from error.log 
    *
  @@ -103,9 +107,16 @@
           unsigned sz = strlen(what);
           if(sz) {
               FILE *f = (FILE *)l->logger_private;
  -            fwrite(what, 1, sz, f);
  -	    /* [V] Flush the dam' thing! */
  -	    fflush(f);
  +
  +            if( f==NULL ) {
  +                /* This is usefull to debug what happens before logger is set.
  +                   On apache you need -X option ( no detach, single process ) */
  +                printf("%s", what );
  +            } else { 
  +                fwrite(what, 1, sz, f);
  +                /* [V] Flush the dam' thing! */
  +                fflush(f);
  +            }
           }
   
           return JK_TRUE;
  @@ -116,6 +127,8 @@
   
   static int jk_logger_file_parseLogLevel(const char *level)
   {
  +    if( level == NULL ) return JK_LOG_ERROR_LEVEL;
  +    
       if(0 == strcasecmp(level, JK_LOG_INFO_VERB)) {
           return JK_LOG_INFO_LEVEL;
       }
  @@ -135,17 +148,18 @@
                                  jk_map_t *properties )
   {
       char *file=map_getStrProp(properties,"logger","file",
  -                              "file","mod_jk.log");
  -    int level=map_getIntProp(properties,"logger","file",
  -                             "level", 0);
  +                              "name","mod_jk.log");
  +    int level;
  +    char *levelS=map_getIntProp(properties,"logger","file",
  +                                "level", "ERROR");
       char *logformat=map_getIntProp(properties,"logger","file",
                                      "timeFormat", JK_TIME_FORMAT);
       FILE *f;
   
  +    _this->level = jk_logger_file_parseLogLevel(levelS);
  +
       jk_logger_file_logFmt = logformat;
   
  -    _this->level = level;
  -    
       f = fopen(file, "a+");
       if(!f) {
           return JK_FALSE;
  @@ -229,13 +243,8 @@
           rc = vsnprintf(buf + used, HUGE_BUFFER_SIZE - used, fmt, args);
   #endif
           va_end(args);
  -        if( l!=NULL ) {        
  -            l->log(l, level, buf);
  -        } else {
  -            /* This is usefull to debug what happens before logger is set.
  -               On apache you need -X option ( no detach, single process ) */
  -            printf("%s", buf );
  -        }
  +
  +        l->log(l, level, buf);
   #ifdef NETWARE
           free(buf);
   #endif
  @@ -245,17 +254,6 @@
   }
   
   
  -static int jk_logger_file_fileExists(const char *f)
  -{
  -    if(f) {
  -        struct stat st;
  -        if((0 == stat(f, &st)) && (st.st_mode & S_IFREG)) {
  -            return JK_TRUE;
  -        }
  -    }
  -    return JK_FALSE;
  -}
  -
   int jk_logger_file_factory(jk_env_t *env,
                              void **result,
                              char *type,
  @@ -269,6 +267,8 @@
   
       l->log = jk_logger_file_log;
       l->logger_private = NULL;
  +    l->open = jk_logger_file_open;
  +    l->jkLog = jk_logger_file_jkLog;
   
       *result=(void *)l;
   
  
  
  

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


Mime
View raw message