mod_lbmethod_heartbeat, mod_heartmonitor: Respect DefaultRuntimeDir/
DEFAULT_REL_RUNTIMEDIR for the heartbeat storage file.
Submitted by: trawick
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1455218 13f79535-47bb-0310-9956-
ffa450edef68
Changes with Apache 2.4.5
+ *) mod_lbmethod_heartbeat, mod_heartmonitor: Respect DefaultRuntimeDir/
+ DEFAULT_REL_RUNTIMEDIR for the heartbeat storage file. [Jeff Trawick]
+
* mod_include: Use new ap_expr for 'elif', like 'if',
if legacy parser is not specified. PR 54548 [Tom Donovan]
PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
[ start all new proposals below, under PATCHES PROPOSED. ]
- * mod_heartmonitor/mod_lbmethod_heartbeat: Respect DefaultRuntimeDir for
- storage path; these have a directive to configure this location
- and THIS CHANGE WILL BREAK PRACTICALLY ALL EXISTING 2.4 CONFIGURATIONS
- THAT USE THOSE DIRECTIVES WITH A RELATIVE PATH; I don't think it is
- worth consideration because of expected zero impact in the user community
- trunk patch: http://svn.apache.org/viewvc?view=revision&revision=1364695
- 2.4.x patch: trunk patch applies (minus CHANGES)
- +1: trawick, fuankg, jim
* mod_rate_limit: Fix error because of negative rate-limit
PR 52964 [ianyin Xu <tixu cs ucsd edu>]
2.4.x patch: trunk patch applies with offset.
+1: jailletc36, humbedooh, jim
-
-
PATCHES PROPOSED TO BACKPORT FROM TRUNK:
[ New proposals should be added at the end of the list ]
int id;
} hm_slot_server_t;
+/* default name of heartbeat data file, created in the configured
+ * runtime directory when mod_slotmem_shm is not available
+ */
+#define DEFAULT_HEARTBEAT_STORAGE "hb.dat"
+
#ifdef __cplusplus
}
#endif
hm_ctx_t *ctx = (hm_ctx_t *) apr_palloc(p, sizeof(hm_ctx_t));
ctx->active = 0;
- ctx->storage_path = ap_server_root_relative(p, "logs/hb.dat");
+ ctx->storage_path = ap_runtime_dir_relative(p, DEFAULT_HEARTBEAT_STORAGE);
/* TODO: Add directive for tuning the update interval
*/
ctx->interval = apr_time_from_sec(HM_UPDATE_SEC);
return err;
}
- ctx->storage_path = ap_server_root_relative(p, path);
+ ctx->storage_path = ap_runtime_dir_relative(p, path);
return NULL;
}
{
lb_hb_ctx_t *ctx = (lb_hb_ctx_t *) apr_palloc(p, sizeof(lb_hb_ctx_t));
- ctx->path = ap_server_root_relative(p, "logs/hb.dat");
+ ctx->path = ap_runtime_dir_relative(p, DEFAULT_HEARTBEAT_STORAGE);
return ctx;
}
return err;
}
- ctx->path = ap_server_root_relative(p, path);
+ ctx->path = ap_runtime_dir_relative(p, path);
return NULL;
}