From: <buc...@us...> - 2009-04-01 15:59:26
|
Revision: 129 http://devmon.svn.sourceforge.net/devmon/?rev=129&view=rev Author: buchanmilne Date: 2009-04-01 15:59:17 +0000 (Wed, 01 Apr 2009) Log Message: ----------- Hobbit rrd collector - always call setup_template, so varying numbers of DSs work Modified Paths: -------------- trunk/extras/do_devmon.c trunk/extras/hobbit-4.2.0-devmon-complete.patch Modified: trunk/extras/do_devmon.c =================================================================== --- trunk/extras/do_devmon.c 2009-04-01 12:38:40 UTC (rev 128) +++ trunk/extras/do_devmon.c 2009-04-01 15:59:17 UTC (rev 129) @@ -70,7 +70,7 @@ devmon_params[numds+5] = rra4; devmon_params[numds+6] = NULL; - if (devmon_tpl == NULL) devmon_tpl = setup_template(devmon_params); + devmon_tpl = setup_template(devmon_params); goto nextline; } Modified: trunk/extras/hobbit-4.2.0-devmon-complete.patch =================================================================== --- trunk/extras/hobbit-4.2.0-devmon-complete.patch 2009-04-01 12:38:40 UTC (rev 128) +++ trunk/extras/hobbit-4.2.0-devmon-complete.patch 2009-04-01 15:59:17 UTC (rev 129) @@ -94,8 +94,8 @@ /* CGI params */ static char *hostname = NULL; ---- hobbit-4.2.0/hobbitd/rrd/do_devmon.c.orig 2008-11-07 02:20:09.000000000 +0200 -+++ hobbit-4.2.0/hobbitd/rrd/do_devmon.c 2008-11-07 02:19:23.000000000 +0200 +--- hobbit-4.2.0/hobbitd/rrd/do_devmon.c.orig 2009-04-01 17:55:12.000000000 +0200 ++++ hobbit-4.2.0/hobbitd/rrd/do_devmon.c 2009-04-01 17:55:06.000000000 +0200 @@ -0,0 +1,110 @@ +/*----------------------------------------------------------------------------*/ +/* Hobbit RRD handler module for Devmon */ @@ -108,7 +108,7 @@ +/* */ +/*----------------------------------------------------------------------------*/ + -+static char devmon_rcsid[] = "$Id $"; ++static char devmon_rcsid[] = "$Id: do_devmon.c 97 2008-12-07 20:02:02Z buchanmilne $"; + +int do_devmon_rrd(char *hostname, char *testname, char *msg, time_t tstamp) +{ @@ -169,7 +169,7 @@ + devmon_params[numds+5] = rra4; + devmon_params[numds+6] = NULL; + -+ if (devmon_tpl == NULL) devmon_tpl = setup_template(devmon_params); ++ devmon_tpl = setup_template(devmon_params); + goto nextline; + } + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |