From: <ber...@us...> - 2011-03-05 00:24:25
|
Revision: 2500 http://ganglia.svn.sourceforge.net/ganglia/?rev=2500&view=rev Author: bernardli Date: 2011-03-05 00:24:19 +0000 (Sat, 05 Mar 2011) Log Message: ----------- [sFlow] Only include sFlow directives in gmond configuration if sFlow feature is enabled Modified Paths: -------------- trunk/monitor-core/lib/default_conf.h.in trunk/monitor-core/lib/libgmond.c Modified: trunk/monitor-core/lib/default_conf.h.in =================================================================== --- trunk/monitor-core/lib/default_conf.h.in 2011-03-04 23:43:17 UTC (rev 2499) +++ trunk/monitor-core/lib/default_conf.h.in 2011-03-05 00:24:19 UTC (rev 2500) @@ -65,23 +65,26 @@ bind = 239.2.11.71\n\ }\n\ \n\ +/* You can specify as many tcp_accept_channels as you like to share\n\ + an xml description of the state of the cluster */\n\ +tcp_accept_channel {\n\ + port = 8649\n\ +}\n\ +\n\ +" + +#define SFLOW_CONFIGURATION "\ /* Channel to receive sFlow datagrams */\n\ #udp_recv_channel {\n\ # port = 6343\n\ #}\n\ \n\ -/* optional sFlow settings */\n\ +/* Optional sFlow settings */\n\ #sflow {\n\ # udp_port = 6343\n\ # accept_vm_metrics = no\n\ #}\n\ \n\ -/* You can specify as many tcp_accept_channels as you like to share\n\ - an xml description of the state of the cluster */\n\ -tcp_accept_channel {\n\ - port = 8649\n\ -}\n\ -\n\ " #define COLLECTION_GROUP_LIST "\ Modified: trunk/monitor-core/lib/libgmond.c =================================================================== --- trunk/monitor-core/lib/libgmond.c 2011-03-04 23:43:17 UTC (rev 2499) +++ trunk/monitor-core/lib/libgmond.c 2011-03-05 00:24:19 UTC (rev 2500) @@ -194,6 +194,9 @@ apr_pool_t *context=(apr_pool_t*)p; default_gmond_configuration = apr_pstrdup(context, BASE_GMOND_CONFIGURATION); +#ifdef SFLOW + default_gmond_configuration = apr_pstrcat(context, default_gmond_configuration, SFLOW_CONFIGURATION, NULL); +#endif default_gmond_configuration = apr_pstrcat(context, default_gmond_configuration, COLLECTION_GROUP_LIST, NULL); #if SOLARIS default_gmond_configuration = apr_pstrcat(context, default_gmond_configuration, SOLARIS_SPECIFIC_CONFIGURATION, NULL); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |