You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by pq...@apache.org on 2008/12/05 10:03:58 UTC
svn commit: r723666 - /httpd/httpd/trunk/modules/cluster/mod_heartbeat.c
Author: pquerna
Date: Fri Dec 5 01:03:57 2008
New Revision: 723666
URL: http://svn.apache.org/viewvc?rev=723666&view=rev
Log:
Show the correct mutex type (even if its just the enum id) rather than the default one, if it fails.
Suggested by: Ruediger Pluem
Modified:
httpd/httpd/trunk/modules/cluster/mod_heartbeat.c
Modified: httpd/httpd/trunk/modules/cluster/mod_heartbeat.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/cluster/mod_heartbeat.c?rev=723666&r1=723665&r2=723666&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/cluster/mod_heartbeat.c (original)
+++ httpd/httpd/trunk/modules/cluster/mod_heartbeat.c Fri Dec 5 01:03:57 2008
@@ -234,6 +234,7 @@
static int hb_init(apr_pool_t *p, apr_pool_t *plog, apr_pool_t *ptemp,
server_rec *s)
{
+ apr_lockmech_e mech;
apr_status_t rv;
hb_ctx_t *ctx = ap_get_module_config(s->module_config, &heartbeat_module);
@@ -244,22 +245,24 @@
return OK;
}
- rv = apr_proc_mutex_create(&ctx->mutex, ctx->mutex_path,
#if APR_HAS_FCNTL_SERIALIZE
- APR_LOCK_FCNTL,
+ mech = APR_LOCK_FCNTL;
#else
#if APR_HAS_FLOCK_SERIALIZE
- APR_LOCK_FLOCK,
+ mech = APR_LOCK_FLOCK;
#else
#error port me to a non crap platform.
#endif
#endif
+
+ rv = apr_proc_mutex_create(&ctx->mutex, ctx->mutex_path,
+ mech,
p);
if (rv) {
ap_log_error(APLOG_MARK, APLOG_CRIT, rv, s,
- "Heartbeat: mutex failed creation at %s (type=%s)",
- ctx->mutex_path, apr_proc_mutex_defname());
+ "Heartbeat: mutex failed creation at %s (type=%d)",
+ ctx->mutex_path, mech);
return !OK;
}