[collectd] [PATCH 2/6] php-collection: Fixes and multiple saved graph lists
Bruno Prémont
bonbons at linux-vserver.org
Sun Mar 1 22:19:43 CET 2009
php-collection/functions.php: Fix collectd_flush()
Some obsolete code in collectd_flush() caused PHP Notice errors
and prevented caused the function to return before attempting
to ask collectd to flush cache.
diff --git a/contrib/php-collection/functions.php b/contrib/php-collection/functions.php
--- a/contrib/php-collection/functions.php
+++ b/contrib/php-collection/functions.php
@@ -260,17 +260,6 @@ function collectd_flush($identifier) {
if (is_null($identifier) || (is_array($identifier) && count($identifier) == 0) || !(is_string($identifier) || is_array($identifier)))
return false;
- if (is_null($host) || !is_string($host) || strlen($host) == 0)
- return false;
- if (is_null($plugin) || !is_string($plugin) || strlen($plugin) == 0)
- return false;
- if (is_null($pinst) || !is_string($pinst))
- return false;
- if (is_null($type) || !is_string($type) || strlen($type) == 0)
- return false;
- if (is_null($tinst) || (is_array($tinst) && count($tinst) == 0) || !(is_string($tinst) || is_array($tinst)))
- return false;
-
$u_errno = 0;
$u_errmsg = '';
if ($socket = @fsockopen($config['collectd_sock'], 0, $u_errno, $u_errmsg)) {
More information about the collectd
mailing list