Skip to content

Fix id for PING and STATUS responses #377

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
jajik wants to merge 1 commit into from
Closed

Fix id for PING and STATUS responses #377

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions native/advertise/mod_advertise.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -691,8 +691,8 @@ static void advertise_info(request_rec *r)
}
if (mconf->ma_advertise_server != NULL) {
ap_rprintf(r, " Advertising on Group %s Port %d ", mconf->ma_advertise_adrs, mconf->ma_advertise_port);
ap_rprintf(r, "for %s://%s:%d every %ld seconds<br/>", mconf->ma_advertise_srvm, mconf->ma_advertise_srvs,
mconf->ma_advertise_srvp, apr_time_sec(mconf->ma_advertise_freq));
ap_rprintf(r, "for %s://%s:%d every %" APR_INT64_T_FMT " seconds<br/>", mconf->ma_advertise_srvm,
mconf->ma_advertise_srvs, mconf->ma_advertise_srvp, apr_time_sec(mconf->ma_advertise_freq));
} else {
ap_rputs("<br/>", r);
}
Expand Down
4 changes: 2 additions & 2 deletions native/mod_manager/mod_manager.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2379,7 +2379,7 @@ static void print_status_response(request_rec *r, const char *jvmroute, int node
ap_set_content_type(r, PLAINTEXT_CONTENT_TYPE);
ap_rprintf(r, "Type=STATUS-RSP&JVMRoute=%.*s", JVMROUTESZ, jvmroute);
ap_rprintf(r, node_up ? "&State=OK" : "&State=NOTOK");
ap_rprintf(r, "&id=%ld", ap_scoreboard_image->global->restart_time);
ap_rprintf(r, "&id=%" APR_INT64_T_FMT, ap_scoreboard_image->global->restart_time);
ap_rprintf(r, "\n");
}

Expand Down Expand Up @@ -2477,7 +2477,7 @@ static void print_ping_response(request_rec *r, const char *jvmroute, int is_up)
ap_rprintf(r, is_up ? "&State=OK" : "&State=NOTOK");
}

ap_rprintf(r, "&id=%ld", ap_scoreboard_image->global->restart_time);
ap_rprintf(r, "&id=%" APR_INT64_T_FMT, ap_scoreboard_image->global->restart_time);
ap_rprintf(r, "\n");
}

Expand Down
14 changes: 9 additions & 5 deletions native/mod_proxy_cluster/mod_proxy_cluster.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2069,22 +2069,25 @@ static proxy_worker *searchworker(request_rec *r, const char *bal, const char *u
if (worker->s->index != -1) {
*id = worker->s->index;
ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server,
"searchworker: %s worker->s->index: %d the_conf %ld", url, *id, (uintptr_t)conf);
"searchworker: %s worker->s->index: %d the_conf %" APR_INT64_T_FMT, url, *id,
(uintptr_t)conf);
*the_conf = conf;
return worker; /* Done current index */
}
helper = (proxy_cluster_helper *)worker->context;
if (helper && helper->index != -1) {
*id = helper->index;
ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server,
"searchworker: %s helper->index %d the_conf %ld", url, *id, (uintptr_t)conf);
"searchworker: %s helper->index %d the_conf %" APR_INT64_T_FMT, url, *id,
(uintptr_t)conf);
*the_conf = conf;
return worker; /* Done previous index */
}
if (helper && helper->shared) {
*id = helper->shared->index;
ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server,
"searchworker: %s helper->shared->index %d the_conf %ld", url, *id, (uintptr_t)conf);
"searchworker: %s helper->shared->index %d the_conf %" APR_INT64_T_FMT, url, *id,
(uintptr_t)conf);
*the_conf = conf;
return worker; /* our index was saved when we remove... */
}
Expand Down Expand Up @@ -2119,7 +2122,8 @@ static proxy_worker *proxy_node_getid(request_rec *r, const char *balancername,
ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server, "proxy_node_getid: searchworker returns NULL");
return NULL;
}
ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server, "proxy_node_getid: the_conf %ld", (uintptr_t)*the_conf);
ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server, "proxy_node_getid: the_conf %" APR_INT64_T_FMT,
(uintptr_t)*the_conf);
return worker;
}

Expand Down Expand Up @@ -2553,7 +2557,7 @@ static int proxy_cluster_post_config(apr_pool_t *p, apr_pool_t *plog, apr_pool_t
}
if (SIZEOFSCORE <= sizeof(proxy_worker_shared)) {
ap_log_error(APLOG_MARK, APLOG_EMERG, 0, s,
"SIZEOFSCORE too small for mod_proxy shared stat structure %d <= %ld", SIZEOFSCORE,
"SIZEOFSCORE too small for mod_proxy shared stat structure %d <= %" APR_INT64_T_FMT, SIZEOFSCORE,
sizeof(proxy_worker_shared));
return HTTP_INTERNAL_SERVER_ERROR;
}
Expand Down
Loading