View | Details | Raw Unified | Return to bug 56869
Collapse All | Expand All

(-)workspace/mod_jk/native/common/jk_ajp_common.c (+4 lines)
Lines 1041-1046 int ajp_connect_to_endpoint(ajp_endpoint Link Here
1041
        return JK_FALSE;
1041
        return JK_FALSE;
1042
    }
1042
    }
1043
    ae->worker->s->connected++;
1043
    ae->worker->s->connected++;
1044
    /* Update maximum number of connections
1045
    */
1046
    if (ae->worker->s->connected > ae->worker->s->max_connected)
1047
        ae->worker->s->max_connected = ae->worker->s->connected;  
1044
    /* set last_access only if needed
1048
    /* set last_access only if needed
1045
     */
1049
     */
1046
    if (ae->worker->cache_timeout > 0)
1050
    if (ae->worker->cache_timeout > 0)
(-)workspace/mod_jk/native/common/jk_shm.h (+2 lines)
Lines 97-102 struct jk_shm_ajp_worker Link Here
97
    /* current error state (runtime) of the worker */
97
    /* current error state (runtime) of the worker */
98
    volatile int state;
98
    volatile int state;
99
    /* Statistical data */
99
    /* Statistical data */
100
    /* Maximum number of connected channels */
101
    volatile int max_connected;
100
    /* Number of currently connected channels */
102
    /* Number of currently connected channels */
101
    volatile int connected;
103
    volatile int connected;
102
    /* Number of currently busy channels */
104
    /* Number of currently busy channels */
(-)workspace/mod_jk/native/common/jk_status.c (-2 / +10 lines)
Lines 263-269 Link Here
263
                                           "<th>State</th>" \
263
                                           "<th>State</th>" \
264
                                           "<th>Acc</th>" \
264
                                           "<th>Acc</th>" \
265
                                           "<th>Err</th><th>CE</th><th>RE</th>" \
265
                                           "<th>Err</th><th>CE</th><th>RE</th>" \
266
                                           "<th>Wr</th><th>Rd</th><th>Busy</th><th>Max</th><th>Con</th><th>LR</th><th>LE</th>" \
266
                                           "<th>Wr</th><th>Rd</th><th>Busy</th><th>Max</th><th>Con</th><th>MxCon</th><th>LR</th><th>LE</th>" \
267
                                           "</tr>\n"
267
                                           "</tr>\n"
268
#define JK_STATUS_SHOW_AJP_ROW             "<tr>" \
268
#define JK_STATUS_SHOW_AJP_ROW             "<tr>" \
269
                                           "<td>%s</td>" \
269
                                           "<td>%s</td>" \
Lines 277-282 Link Here
277
                                           "<td>%d</td>" \
277
                                           "<td>%d</td>" \
278
                                           "<td>%d</td>" \
278
                                           "<td>%d</td>" \
279
                                           "<td>%d</td>" \
279
                                           "<td>%d</td>" \
280
                                           "<td>%d</td>" \
280
                                           "<td>%s</td>" \
281
                                           "<td>%s</td>" \
281
                                           "</tr>\n"
282
                                           "</tr>\n"
282
#define JK_STATUS_SHOW_LB_HEAD             "<tr>" \
283
#define JK_STATUS_SHOW_LB_HEAD             "<tr>" \
Lines 308-314 Link Here
308
                                           "<th>D</th><th>F</th><th>M</th>" \
309
                                           "<th>D</th><th>F</th><th>M</th>" \
309
                                           "<th>V</th><th>Acc</th><th>Sess</th>" \
310
                                           "<th>V</th><th>Acc</th><th>Sess</th>" \
310
                                           "<th>Err</th><th>CE</th><th>RE</th>" \
311
                                           "<th>Err</th><th>CE</th><th>RE</th>" \
311
                                           "<th>Wr</th><th>Rd</th><th>Busy</th><th>Max</th><th>Con</th>" \
312
                                           "<th>Wr</th><th>Rd</th><th>Busy</th><th>Max</th><th>Con</th><th>MxCon</th>" \
312
                                           "<th>" JK_STATUS_ARG_LBM_TEXT_ROUTE "</th>" \
313
                                           "<th>" JK_STATUS_ARG_LBM_TEXT_ROUTE "</th>" \
313
                                           "<th>RR</th><th>Cd</th><th>Rs</th><th>LR</th><th>LE</th>" \
314
                                           "<th>RR</th><th>Cd</th><th>Rs</th><th>LR</th><th>LE</th>" \
314
                                           "</tr>\n"
315
                                           "</tr>\n"
Lines 329-334 Link Here
329
                                           "<td>%d</td>" \
330
                                           "<td>%d</td>" \
330
                                           "<td>%d</td>" \
331
                                           "<td>%d</td>" \
331
                                           "<td>%d</td>" \
332
                                           "<td>%d</td>" \
333
                                           "<td>%d</td>" \
332
                                           "<td>%s</td>" \
334
                                           "<td>%s</td>" \
333
                                           "<td>%s</td>" \
335
                                           "<td>%s</td>" \
334
                                           "<td>%s</td>" \
336
                                           "<td>%s</td>" \
Lines 1849-1854 static void display_worker_ajp_details(j Link Here
1849
                      aw->s->busy,
1851
                      aw->s->busy,
1850
                      aw->s->max_busy,
1852
                      aw->s->max_busy,
1851
                      aw->s->connected,
1853
                      aw->s->connected,
1854
                      aw->s->max_connected,
1852
                      wr->route,
1855
                      wr->route,
1853
                      wr->redirect ? (*wr->redirect ? wr->redirect : "&nbsp;") : "&nbsp",
1856
                      wr->redirect ? (*wr->redirect ? wr->redirect : "&nbsp;") : "&nbsp",
1854
                      wr->domain ? (*wr->domain ? wr->domain : "&nbsp;") : "&nbsp",
1857
                      wr->domain ? (*wr->domain ? wr->domain : "&nbsp;") : "&nbsp",
Lines 1871-1876 static void display_worker_ajp_details(j Link Here
1871
                      aw->s->busy,
1874
                      aw->s->busy,
1872
                      aw->s->max_busy,
1875
                      aw->s->max_busy,
1873
                      aw->s->connected,
1876
                      aw->s->connected,
1877
                      aw->s->max_connected,
1874
                      delta_reset,
1878
                      delta_reset,
1875
                      rc_time > 0 ? buf_time : "&nbsp;");
1879
                      rc_time > 0 ? buf_time : "&nbsp;");
1876
        }
1880
        }
Lines 1928-1933 static void display_worker_ajp_details(j Link Here
1928
        jk_print_xml_att_int(s, off+2, "busy", aw->s->busy);
1932
        jk_print_xml_att_int(s, off+2, "busy", aw->s->busy);
1929
        jk_print_xml_att_int(s, off+2, "max_busy", aw->s->max_busy);
1933
        jk_print_xml_att_int(s, off+2, "max_busy", aw->s->max_busy);
1930
        jk_print_xml_att_int(s, off+2, "connected", aw->s->connected);
1934
        jk_print_xml_att_int(s, off+2, "connected", aw->s->connected);
1935
        jk_print_xml_att_int(s, off+2, "max_connected", aw->s->max_connected);
1931
        if (lb) {
1936
        if (lb) {
1932
            jk_print_xml_att_int(s, off+2, "time_to_recover_min", rs_min);
1937
            jk_print_xml_att_int(s, off+2, "time_to_recover_min", rs_min);
1933
            jk_print_xml_att_int(s, off+2, "time_to_recover_max", rs_max);
1938
            jk_print_xml_att_int(s, off+2, "time_to_recover_max", rs_max);
Lines 1995-2000 static void display_worker_ajp_details(j Link Here
1995
        jk_printf(s, " busy=%d", aw->s->busy);
2000
        jk_printf(s, " busy=%d", aw->s->busy);
1996
        jk_printf(s, " max_busy=%d", aw->s->max_busy);
2001
        jk_printf(s, " max_busy=%d", aw->s->max_busy);
1997
        jk_printf(s, " connected=%d", aw->s->connected);
2002
        jk_printf(s, " connected=%d", aw->s->connected);
2003
        jk_printf(s, " max_connected=%d", aw->s->max_connected);
1998
        if (lb) {
2004
        if (lb) {
1999
            jk_printf(s, " time_to_recover_min=%d", rs_min);
2005
            jk_printf(s, " time_to_recover_min=%d", rs_min);
2000
            jk_printf(s, " time_to_recover_max=%d", rs_max);
2006
            jk_printf(s, " time_to_recover_max=%d", rs_max);
Lines 2059-2064 static void display_worker_ajp_details(j Link Here
2059
        jk_print_prop_att_int(s, w, ajp_name, "busy", aw->s->busy);
2065
        jk_print_prop_att_int(s, w, ajp_name, "busy", aw->s->busy);
2060
        jk_print_prop_att_int(s, w, ajp_name, "max_busy", aw->s->max_busy);
2066
        jk_print_prop_att_int(s, w, ajp_name, "max_busy", aw->s->max_busy);
2061
        jk_print_prop_att_int(s, w, ajp_name, "connected", aw->s->connected);
2067
        jk_print_prop_att_int(s, w, ajp_name, "connected", aw->s->connected);
2068
        jk_print_prop_att_int(s, w, ajp_name, "max_connected", aw->s->max_connected);
2062
        if (lb) {
2069
        if (lb) {
2063
            jk_print_prop_att_int(s, w, ajp_name, "time_to_recover_min", rs_min);
2070
            jk_print_prop_att_int(s, w, ajp_name, "time_to_recover_min", rs_min);
2064
            jk_print_prop_att_int(s, w, ajp_name, "time_to_recover_max", rs_max);
2071
            jk_print_prop_att_int(s, w, ajp_name, "time_to_recover_max", rs_max);
Lines 3726-3731 static void display_legend(jk_ws_service Link Here
3726
            "<tr><th>Busy</th><td>Current number of busy connections</td></tr>\n"
3733
            "<tr><th>Busy</th><td>Current number of busy connections</td></tr>\n"
3727
            "<tr><th>Max</th><td>Maximum number of busy connections</td></tr>\n"
3734
            "<tr><th>Max</th><td>Maximum number of busy connections</td></tr>\n"
3728
            "<tr><th>Con</th><td>Current number of backend connections</td></tr>\n"
3735
            "<tr><th>Con</th><td>Current number of backend connections</td></tr>\n"
3736
            "<tr><th>MxCon</th><td>Maximum number of backend connections</td></tr>\n"
3729
            "<tr><th>RR</th><td>Route redirect</td></tr>\n"
3737
            "<tr><th>RR</th><td>Route redirect</td></tr>\n"
3730
            "<tr><th>Cd</th><td>Cluster domain</td></tr>\n"
3738
            "<tr><th>Cd</th><td>Cluster domain</td></tr>\n"
3731
            "<tr><th>Rs</th><td>Recovery scheduled in app. min/max seconds</td></tr>\n"
3739
            "<tr><th>Rs</th><td>Recovery scheduled in app. min/max seconds</td></tr>\n"

Return to bug 56869