Author: jfrederic.clere(a)jboss.com
Date: 2009-01-28 16:28:05 -0500 (Wed, 28 Jan 2009)
New Revision: 2241
Modified:
trunk/mod_cluster/native/advertise/mod_advertise.c
Log:
Add traces.
Modified: trunk/mod_cluster/native/advertise/mod_advertise.c
===================================================================
--- trunk/mod_cluster/native/advertise/mod_advertise.c 2009-01-28 19:33:19 UTC (rev 2240)
+++ trunk/mod_cluster/native/advertise/mod_advertise.c 2009-01-28 21:28:05 UTC (rev 2241)
@@ -330,27 +330,37 @@
}
static apr_status_t ma_group_join(const char *addr, apr_port_t port,
- apr_pool_t *pool)
+ apr_pool_t *pool, server_rec *s)
{
apr_status_t rv;
if ((rv = apr_sockaddr_info_get(&ma_mgroup_sa, addr,
APR_INET, port,
- APR_UNSPEC, pool)) != APR_SUCCESS)
+ APR_UNSPEC, pool)) != APR_SUCCESS) {
+ ap_log_error(APLOG_MARK, APLOG_ERR, rv, s,
+ "mod_advertise: ma_group_join apr_sockaddr_info_get
failed");
return rv;
+ }
if ((rv = apr_socket_create(&ma_mgroup_socket,
ma_mgroup_sa->family,
SOCK_DGRAM,
APR_PROTO_UDP,
- pool)) != APR_SUCCESS)
+ pool)) != APR_SUCCESS) {
+ ap_log_error(APLOG_MARK, APLOG_ERR, rv, s,
+ "mod_advertise: ma_group_join apr_socket_create failed");
return rv;
+ }
if ((rv = apr_mcast_join(ma_mgroup_socket, ma_mgroup_sa,
NULL, NULL)) != APR_SUCCESS) {
+ ap_log_error(APLOG_MARK, APLOG_ERR, rv, s,
+ "mod_advertise: ma_group_join apr_mcast_join failed");
apr_socket_close(ma_mgroup_socket);
return rv;
}
if ((rv = apr_mcast_hops(ma_mgroup_socket,
MA_ADVERTISE_HOPS)) != APR_SUCCESS) {
+ ap_log_error(APLOG_MARK, APLOG_ERR, rv, s,
+ "mod_advertise: ma_group_join apr_mcast_hops failed");
apr_mcast_leave(ma_mgroup_socket, ma_mgroup_sa,
NULL, NULL);
apr_socket_close(ma_mgroup_socket);
@@ -522,7 +532,7 @@
/* Check if we have advertise set */
if (ma_advertise_mode != ma_advertise_off &&
ma_advertise_adrs) {
- rv = ma_group_join(ma_advertise_adrs, ma_advertise_port, pconf);
+ rv = ma_group_join(ma_advertise_adrs, ma_advertise_port, pconf, s);
if (rv != APR_SUCCESS) {
ap_log_error(APLOG_MARK, APLOG_ERR, rv, s,
"mod_advertise: multicast join failed for %s:%d.",