Author: jfrederic.clere(a)jboss.com Date: 2008-10-14 05:54:05 -0400 (Tue, 14 Oct 2008) New Revision: 1955 Modified: trunk/mod_cluster/native/mod_manager/mod_manager.c Log: Arrange INFO to follow https://www.jboss.org/community/docs/DOC-11422 Modified: trunk/mod_cluster/native/mod_manager/mod_manager.c =================================================================== --- trunk/mod_cluster/native/mod_manager/mod_manager.c 2008-10-13 13:01:38 UTC (rev 1954) +++ trunk/mod_cluster/native/mod_manager/mod_manager.c 2008-10-14 09:54:05 UTC (rev 1955) @@ -793,17 +793,65 @@ for (i=0; i<size; i++) { nodeinfo_t *ou; proxy_worker_stat *proxystat; + char *flushpackets; get_node(nodestatsmem, &ou, id[i]); - ap_rprintf(r, "node: [%d:%d],JVMRoute: %s,Domain: [%s],Host: %s,Port: %s,Type: %s", - id[i], ou->mess.id, ou->mess.JVMRoute, ou->mess.Domain, + ap_rprintf(r, "node: [%d],Name: %s,Domain: %s,Host: %s,Port: %s,Type: %s", + id[i], ou->mess.JVMRoute, ou->mess.Domain, ou->mess.Host, ou->mess.Port, ou->mess.Type); + flushpackets = "Off"; + switch (ou->mess.flushpackets) { + case flush_on: + flushpackets = "On"; + break; + case flush_auto: + flushpackets = "Auto"; + } + ap_rprintf(r, ",Flushpackets: %s,Flushwait: %d,Ping: %d,Smax: %d,Ttl: %d", + flushpackets, ou->mess.flushwait, + ou->mess.ping, ou->mess.smax, ou->mess.ttl); proxystat = (proxy_worker_stat *) ou->stat; - ap_rprintf(r, ",removed: %d,status: %d,elected: %d,lbstatus: %d,lbfactor: %d,route: %s\n", - ou->mess.remove, - proxystat->status, proxystat->elected, proxystat->lbstatus, - proxystat->lbfactor, proxystat->route); + ap_rprintf(r, ",Elected: %d,Read: %d,Transfered: %d,Connected: %d,Load: %d\n", + proxystat->elected, proxystat->read, proxystat->transferred, + proxystat->busy, proxystat->lbfactor); } + + /* Process the Vhosts */ + size = get_max_size_host(hoststatsmem); + id = apr_palloc(r->pool, sizeof(int) * size); + size = get_ids_used_host(hoststatsmem, id); + for (i=0; i<size; i++) { + hostinfo_t *ou; + get_host(hoststatsmem, &ou, id[i]); + ap_rprintf(r, "Vhost: [%d:%d:%d], Alias: %s\n", + ou->node, ou->vhost, id[i], ou->host); + } + + /* Process the Contexts */ + size = get_max_size_context(contextstatsmem); + id = apr_palloc(r->pool, sizeof(int) * size); + size = get_ids_used_context(contextstatsmem, id); + for (i=0; i<size; i++) { + contextinfo_t *ou; + char *status; + get_context(contextstatsmem, &ou, id[i]); + status = "REMOVED"; + switch (ou->status) { + case ENABLED: + status = "ENABLED"; + break; + case DISABLED: + status = "DISABLED"; + break; + case STOPPED: + status = "STOPPED"; + break; + } + ap_rprintf(r, "Context: [%d:%d:%d], Context: %s, Status: %s\n", + ou->node, ou->vhost, id[i], + ou->context, + status); + } return NULL; }