Attachment #31749 for bug #56667

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




        if (status_get_string(p, JK_STATUS_ARG_LBM_ACTIVATION, NULL, &arg, l) == JK_TRUE) {
            i = jk_lb_get_activation_code(arg);
            if (i != wr->activation && i >= 0 && i <= JK_LB_ACTIVATION_MAX) {
                const char *oldact = jk_lb_get_activation(wr, l);
                wr->activation = i;
                jk_log(l, JK_LOG_INFO,
                       "Status worker '%s' setting 'activation' for sub worker '%s' of lb worker '%s' from '%s' to '%s'",
                       w->name, wr->name, lb_name, oldact, jk_lb_get_activation(wr, l));
                *side_effect |= JK_STATUS_NEEDS_RESET_LB_VALUES | JK_STATUS_NEEDS_PUSH;
            }
        }

                    if (rv == JK_TRUE) {
                        i = jk_lb_get_activation_code(arg);
                        if (i != wr->activation && i >= 0 && i <= JK_LB_ACTIVATION_MAX) {
                            const char *oldact = jk_lb_get_activation(wr, l);
                                   "Status worker '%s' setting 'activation' for sub worker '%s' of lb worker '%s' to '%s'",
                                   w->name, wr->name, name, jk_lb_get_activation(wr, l));
                            wr->activation = i;
                            jk_log(l, JK_LOG_INFO,
                                   "Status worker '%s' setting 'activation' for sub worker '%s' of lb worker '%s' from '%s' to '%s'",
                                   w->name, wr->name, name, oldact, jk_lb_get_activation(wr, l));
                            rc = 1;
                            sync_needed = JK_TRUE;
                        }

Return to bug 56667

Lines 3291-3300 Link Here

(-)common/jk_status.c-orig (-5 / +7 lines)
3291	if (status_get_string(p, JK_STATUS_ARG_LBM_ACTIVATION, NULL, &arg, l) == JK_TRUE) {	3291	if (status_get_string(p, JK_STATUS_ARG_LBM_ACTIVATION, NULL, &arg, l) == JK_TRUE) {
3292	i = jk_lb_get_activation_code(arg);	3292	i = jk_lb_get_activation_code(arg);
3293	if (i != wr->activation && i >= 0 && i <= JK_LB_ACTIVATION_MAX) {	3293	if (i != wr->activation && i >= 0 && i <= JK_LB_ACTIVATION_MAX) {
		3294	const char *oldact = jk_lb_get_activation(wr, l);
3294	wr->activation = i;	3295	wr->activation = i;
3295	jk_log(l, JK_LOG_INFO,	3296	jk_log(l, JK_LOG_INFO,
3296	"Status worker '%s' setting 'activation' for sub worker '%s' of lb worker '%s' to '%s'",	3297	"Status worker '%s' setting 'activation' for sub worker '%s' of lb worker '%s' from '%s' to '%s'",
3297	w->name, wr->name, lb_name, jk_lb_get_activation(wr, l));	3298	w->name, wr->name, lb_name, oldact, jk_lb_get_activation(wr, l));
3298	*side_effect \|= JK_STATUS_NEEDS_RESET_LB_VALUES \| JK_STATUS_NEEDS_PUSH;	3299	*side_effect \|= JK_STATUS_NEEDS_RESET_LB_VALUES \| JK_STATUS_NEEDS_PUSH;
3299	}	3300	}
3300	}	3301	}
Lines 3601-3610 Link Here
3601	if (rv == JK_TRUE) {	3602	if (rv == JK_TRUE) {
3602	i = jk_lb_get_activation_code(arg);	3603	i = jk_lb_get_activation_code(arg);
3603	if (i != wr->activation && i >= 0 && i <= JK_LB_ACTIVATION_MAX) {	3604	if (i != wr->activation && i >= 0 && i <= JK_LB_ACTIVATION_MAX) {
3604	jk_log(l, JK_LOG_INFO,	3605	const char *oldact = jk_lb_get_activation(wr, l);
3605	"Status worker '%s' setting 'activation' for sub worker '%s' of lb worker '%s' to '%s'",
3606	w->name, wr->name, name, jk_lb_get_activation(wr, l));
3607	wr->activation = i;	3606	wr->activation = i;
		3607	jk_log(l, JK_LOG_INFO,
		3608	"Status worker '%s' setting 'activation' for sub worker '%s' of lb worker '%s' from '%s' to '%s'",
		3609	w->name, wr->name, name, oldact, jk_lb_get_activation(wr, l));
3608	rc = 1;	3610	rc = 1;
3609	sync_needed = JK_TRUE;	3611	sync_needed = JK_TRUE;
3610	}	3612	}