cvs commit: jakarta-tomcat-connectors/jk/native/common jk_lb_worker.c

[mturk]

mturk       2004/11/11 10:43:07

  Modified:    jk/native/common jk_lb_worker.c
  Log:
  Add new trace macros and clean up some log messages.
  
  Revision  Changes    Path
  1.29      +12 -5     jakarta-tomcat-connectors/jk/native/common/jk_lb_worker.c
  
  Index: jk_lb_worker.c
  ===================================================================
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_lb_worker.c,v
  retrieving revision 1.28
  retrieving revision 1.29
  diff -u -r1.28 -r1.29
  --- jk_lb_worker.c    11 Nov 2004 09:45:23 -0000      1.28
  +++ jk_lb_worker.c    11 Nov 2004 18:43:07 -0000      1.29
  @@ -337,7 +337,8 @@
                        */
                       jk_log(l, JK_LOG_ERROR,
                              "lb: unrecoverable error, request failed. Tomcat 
failed in the middle of request, we can't recover to another instance.\n");
  -                    break;
  +                    JK_TRACE_EXIT(l);
  +                    return JK_FALSE;
                   }
   
                   /* 
  @@ -351,13 +352,14 @@
                   /* NULL record, no more workers left ... */
                   jk_log(l, JK_LOG_ERROR,
                          "lb: All tomcat instances failed, no more workers 
left.\n");
  +                JK_TRACE_EXIT(l);
                   return JK_FALSE;
  -                break;
               }
           }
       }
   
       jk_log(l, JK_LOG_ERROR, "lb: end of service with error\n");
  +    JK_TRACE_EXIT(l);
       return JK_FALSE;
   }
   
  @@ -379,7 +381,7 @@
       }
   
       JK_LOG_NULL_PARAMS(l);
  -
  +    JK_TRACE_EXIT(l);
       return JK_FALSE;
   }
   
  @@ -409,6 +411,7 @@
                                             sizeof(worker_record_t));
   
               if (!p->lb_workers) {
  +                JK_TRACE_EXIT(l);
                   return JK_FALSE;
               }
   
  @@ -460,7 +463,7 @@
               if (i != num_of_workers) {
                   close_workers(p, i, l);
                   jk_log(l, JK_LOG_DEBUG,
  -                       "In jk_worker_t::validate: Failed to create worker 
%s\n",
  +                       "Failed to create worker %s\n",
                          p->lb_workers[i].name);
   
               }
  @@ -484,6 +487,7 @@
       }
   
       JK_LOG_NULL_PARAMS(l);
  +    JK_TRACE_EXIT(l);
       return JK_FALSE;
   }
   
  @@ -516,6 +520,7 @@
           JK_LOG_NULL_PARAMS(l);
       }
   
  +    JK_TRACE_EXIT(l);
       return JK_FALSE;
   }
   
  @@ -536,6 +541,7 @@
       }
   
       JK_LOG_NULL_PARAMS(l);
  +    JK_TRACE_EXIT(l);
       return JK_FALSE;
   }
   
  @@ -570,5 +576,6 @@
           JK_LOG_NULL_PARAMS(l);
       }
   
  +    JK_TRACE_EXIT(l);
       return JK_FALSE;
   }
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]