Merge remote-tracking branch 'dhchen/master'

2 files changed, 24 insertions, 17 deletions

diff --git a/conf/config.php b/conf/config.php
index 3d54e26..e40cc9f 100644
--- a/conf/config.php
+++ b/conf/config.php
@@ -7,7 +7,7 @@ $CONFIG['version'] = 5;
 $CONFIG['datadir'] = '/var/lib/collectd/rrd';
 
 # location of the types.db file
-$CONFIG['typesdb'] = '/usr/share/collectd/types.db';
+$CONFIG['typesdb'][] = '/usr/share/collectd/types.db';
 
 # rrdtool executable
 $CONFIG['rrdtool'] = '/usr/bin/rrdtool';
diff --git a/inc/collectd.inc.php b/inc/collectd.inc.php
index 695d79c..bbed611 100644
--- a/inc/collectd.inc.php
+++ b/inc/collectd.inc.php
@@ -168,25 +168,32 @@ function plugin_sort($data) {
         return $data;
 }
 
-function parse_typesdb_file($file = '/usr/share/collectd/types.db') {
-        if (!file_exists($file))
-                $file = 'inc/types.db';
+function parse_typesdb_file($file = array('/usr/share/collectd/types.db')) {
+        if (!is_array($file))
+                $file = array($file);
+        if (!file_exists($file[0]))
+                $file[0] = 'inc/types.db';
 
         $types = array();
-        foreach (file($file) as $type) {
-                if(!preg_match('/^(?P<dataset>[\w_]+)\s+(?P<datasources>.*)/', $type, $matches))
+        foreach ($file as $single_file)
+        {
+                if (!file_exists($single_file))
                         continue;
-                $dataset = $matches['dataset'];
-                $datasources = explode(', ', $matches['datasources']);
-
-                foreach ($datasources as $ds) {
-                        if (!preg_match('/^(?P<dsname>\w+):(?P<dstype>[\w]+):(?P<min>[\-\dU\.]+):(?P<max>[\dU\.]+)/', $ds, $matches))
-                                error_log(sprintf('CGP Error: DS "%s" from dataset "%s" did not match', $ds, $dataset));
-                        $types[$dataset][$matches['dsname']] = array(
-                                'dstype' => $matches['dstype'],
-                                'min' => $matches['min'],
-                                'max' => $matches['max'],
-                        );
+                foreach (file($single_file) as $type) {
+                        if(!preg_match('/^(?P<dataset>[\w_]+)\s+(?P<datasources>.*)/', $type, $matches))
+                                continue;
+                        $dataset = $matches['dataset'];
+                        $datasources = explode(', ', $matches['datasources']);
+
+                        foreach ($datasources as $ds) {
+                                if (!preg_match('/^(?P<dsname>\w+):(?P<dstype>[\w]+):(?P<min>[\-\dU\.]+):(?P<max>[\dU\.]+)/', $ds, $matches))
+                                        error_log(sprintf('CGP Error: DS "%s" from dataset "%s" did not match', $ds, $dataset));
+                                $types[$dataset][$matches['dsname']] = array(
+                                        'dstype' => $matches['dstype'],
+                                        'min' => $matches['min'],
+                                        'max' => $matches['max'],
+                                );
+                        }
                 }
         }
         return $types;