Tweak logging levels, add more info, minor format tweaks

Author: jajik

native/common/common.c

@@ -393,9 +393,8 @@ node_context *find_node_context_host(request_rec *r, const proxy_balancer *balan
             continue;
         }
         context = &context_table->context_info[j];
-        ap_log_error(APLOG_MARK, APLOG_TRACE4, 0, r->server,
-                     "find_node_context_host: %s node: %d vhost: %d context: %s", uri, context->node, context->vhost,
-                     context->context);
+        ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server, "find_node_context_host: %s node: %d vhost: %d context: %s",
+                     uri, context->node, context->vhost, context->context);
     }
 #endif
 

native/mod_manager/mod_manager.c

@@ -1216,8 +1216,9 @@ static const proxy_worker_shared *read_shared_by_node(request_rec *r, nodeinfo_t
         workers = (proxy_worker **)balancer->workers->elts;
         for (j = 0; j < balancer->workers->nelts; j++, workers++) {
             proxy_worker *worker = *workers;
-            ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server, "read_shared_by_node: Balancer %s worker %s, %s, %d",
-                         balancer->s->name, worker->s->route, worker->s->hostname, worker->s->port);
+            ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server,
+                         "read_shared_by_node: Balancer %s worker (%d) %s, %s, %d", balancer->s->name, worker->s->index,
+                         worker->s->route, worker->s->hostname, worker->s->port);
             if (worker->s->port == port && strcmp(worker->s->hostname, node->mess.Host) == 0 &&
                 strcmp(worker->s->route, node->mess.JVMRoute) == 0) {
                 return worker->s;
@@ -1904,7 +1905,7 @@ static char *process_info(request_rec *r, int *errtype)
 
         proxystat = read_shared_by_node(r, ou);
         if (!proxystat) {
-            ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server, "process_config: No proxystat, assum zeros");
+            ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server, "process_config: No proxystat, assume zeros");
             proxystat = apr_pcalloc(r->pool, sizeof(proxy_worker_shared));
         }
 

native/mod_proxy_cluster/mod_proxy_cluster.c

@@ -291,7 +291,8 @@ static apr_status_t create_worker_reuse(proxy_server_conf *conf, const char *ptr
     helper = *helper_ptr;
     if (helper->index == -1) {
         /* We are going to reuse a removed one */
-        ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, server, "create_worker_reuse: reusing removed worker for %s", url);
+        ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, server, "create_worker_reuse: reusing removed worker (%d) for %s",
+                     node->mess.id, url);
         return APR_SUCCESS;
     }
 
@@ -504,7 +505,7 @@ static apr_status_t create_worker(proxy_server_conf *conf, proxy_balancer *balan
     }
 
     /* No, it does not exist, so we will create a new one.
-     * Note that the ap_proxy_get_worker and ap_proxy_define_worker aren't symetrical, and
+     * Note that the ap_proxy_get_worker and ap_proxy_define_worker aren't symmetrical, and
      * this leaks via the conf->pool
      */
     ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, server, "create_worker: worker for %s Will create %d!!!", url,
@@ -797,13 +798,15 @@ static proxy_worker *get_worker_from_id_stat(const proxy_server_conf *conf, int
         for (j = 0; j < balancer->workers->nelts; j++, ptrw = ptrw + sizew) {
             proxy_worker **worker = (proxy_worker **)ptrw;
             proxy_cluster_helper *helper = (proxy_cluster_helper *)(*worker)->context;
+
             if ((*worker)->s == stat && helper->index == id) {
                 if (is_worker_empty(*worker)) {
                     return NULL;
-                } else {
-                    return *worker;
                 }
+
+                return *worker;
             }
+
             if (helper->index == id) {
                 unpair_worker_node((*worker)->s, node);
                 helper->shared->index = -1;
@@ -1836,9 +1839,12 @@ static int proxy_node_isup(request_rec *r, int id, int load)
     char *ptr;
 
     if (node_storage->read_node(id, &node) != APR_SUCCESS) {
+        ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server, "proxy_cluster_isup: Can't read node with id %d.", id);
         return HTTP_INTERNAL_SERVER_ERROR;
     }
     if (node->mess.remove) {
+        ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server,
+                     "proxy_cluster_isup: Node with id %d is marked for removal.", id);
         return HTTP_INTERNAL_SERVER_ERROR;
     }