cvs commit: jakarta-tomcat/src/native/mod_jk/iis jk_isapi_plugin.c

[nacho]

nacho       01/09/12 18:49:52

  Modified:    src/native/mod_jk/iis jk_isapi_plugin.c
  Log:
  Oops , logging before the opening of the log file is not a good idea :)
  
  Thanks to Tim Whittington
  
  Revision  Changes    Path
  1.6       +5 -4      jakarta-tomcat/src/native/mod_jk/iis/jk_isapi_plugin.c
  
  Index: jk_isapi_plugin.c
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/native/mod_jk/iis/jk_isapi_plugin.c,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- jk_isapi_plugin.c 2001/09/13 01:11:25     1.5
  +++ jk_isapi_plugin.c 2001/09/13 01:49:51     1.6
  @@ -57,7 +57,7 @@
    * Description: ISAPI plugin for IIS/PWS                                   *
    * Author:      Gal Shachor <[EMAIL PROTECTED]>                           *
    * Author:      Ignacio J. Ortega <[EMAIL PROTECTED]>                       *
  - * Version:     $Revision: 1.5 $                                           *
  + * Version:     $Revision: 1.6 $                                           *
    ***************************************************************************/
   
   #include <httpext.h>
  @@ -650,6 +650,10 @@
       if(read_registry_init_data()) {
           jk_map_t *map;
   
  +        if(!jk_open_file_logger(&logger, log_file, log_level)) {
  +            logger = NULL;
  +        }
  +
                /* Logging the initialization type: registry or properties file in 
virtual dir
                */
                if (using_ini_file) {
  @@ -663,9 +667,6 @@
                jk_log(logger, JK_LOG_DEBUG, "Using worker file %s.\n", worker_file);
                jk_log(logger, JK_LOG_DEBUG, "Using worker mount file %s.\n", 
worker_mount_file);
   
  -        if(!jk_open_file_logger(&logger, log_file, log_level)) {
  -            logger = NULL;
  -        }
           
           if(map_alloc(&map)) {
               if(map_read_properties(map, worker_mount_file)) {