Changeset 2046

Timestamp:

01/17/2008 09:55:07 AM (8 months ago)

Author:

glen

Message:

- add IdleServers? and Scoreboard directives in ?auto mode for mod_status (#1507)

Location:

trunk

Files:

• NEWS (modified) (1 diff)
• src/mod_status.c (modified) (3 diffs)

trunk/NEWS

@@ -13 +13 @@
   * fix bug that rrdtool reports "0" for incoming data (#1514)
   * ssl.cipher-list and ssl.use-sslv2 ported from 1.4.x (#1422)
+  * add IdleServers and Scoreboard directives in ?auto mode for mod_status (#1507)
 
 - 1.5.0-r19.. -

trunk/src/mod_status.c

@@ -570 +570 @@
         time_t ts;
         size_t j;
+        unsigned int k;
+        unsigned int l;
 
         b = chunkqueue_get_append_buffer(con->send);
@@ -596 +598 @@
         BUFFER_APPEND_STRING_CONST(b, "\n");
 
+        BUFFER_APPEND_STRING_CONST(b, "IdleServers: ");
+        buffer_append_long(b, srv->conns->size - srv->conns->used);
+        BUFFER_APPEND_STRING_CONST(b, "\n");
+
         /* output traffic */
         BUFFER_APPEND_STRING_CONST(b, "Traffic: ");
@@ -609 +615 @@
         avg /= 5;
         buffer_append_long(b, avg);
+        BUFFER_APPEND_STRING_CONST(b, "\n");
+
+        /* output scoreboard */
+        BUFFER_APPEND_STRING_CONST(b, "Scoreboard: ");
+        for (k = 0; k < srv->conns->used; k++) {
+                connection *c = srv->conns->ptr[k];
+                const char *state = connection_get_short_state(c->state);
+                buffer_append_string_len(b, state, 1);
+        }
+        for (l = 0; l < srv->conns->size - srv->conns->used; l++) {
+                BUFFER_APPEND_STRING_CONST(b, "_");
+        }
         BUFFER_APPEND_STRING_CONST(b, "\n");