TEXT   23

lock.txt

Guest on 6th August 2021 04:46:09 PM

  1. Index: modules/proxy/mod_proxy_balancer.c
  2. ===================================================================
  3. --- modules/proxy/mod_proxy_balancer.c  (revision 484982)
  4. +++ modules/proxy/mod_proxy_balancer.c  (working copy)
  5. @@ -280,9 +280,13 @@
  6.                                        request_rec *r)
  7.  {
  8.      proxy_worker *candidate = NULL;
  9. +    apr_status_t rv;
  10.  
  11. -    if (PROXY_THREAD_LOCK(balancer) != APR_SUCCESS)
  12. +    if ((rv = PROXY_THREAD_LOCK(balancer)) != APR_SUCCESS) {
  13. +        ap_log_error(APLOG_MARK, APLOG_ERR, rv, r->server,
  14. +        "proxy: BALANCER: (%s). Lock failed for find_best_worker()", balancer->name);
  15.          return NULL;
  16. +    }
  17.  
  18.      candidate = (*balancer->lbmethod->finder)(balancer, r);
  19.  
  20. @@ -379,7 +383,8 @@
  21.       */
  22.      if ((rv = PROXY_THREAD_LOCK(*balancer)) != APR_SUCCESS) {
  23.          ap_log_error(APLOG_MARK, APLOG_ERR, rv, r->server,
  24. -                     "proxy: BALANCER: lock");
  25. +                     "proxy: BALANCER: (%s). Lock failed for pre_request",
  26. +                     (*balancer)->name);
  27.          return DECLINED;
  28.      }
  29.      if (runtime) {
  30. @@ -482,7 +487,8 @@
  31.  
  32.      if ((rv = PROXY_THREAD_LOCK(balancer)) != APR_SUCCESS) {
  33.          ap_log_error(APLOG_MARK, APLOG_ERR, rv, r->server,
  34. -            "proxy: BALANCER: lock");
  35. +            "proxy: BALANCER: (%s). Lock failed for post_request",
  36. +            balancer->name);
  37.          return HTTP_INTERNAL_SERVER_ERROR;
  38.      }
  39.      /* TODO: calculate the bytes transferred

Raw Paste


Login or Register to edit or fork this paste. It's free.