contrib/collection3: Use “{plugin_inst}/{type_inst}” for “{instance}”
authorFlorian Forster <octo@noris.net>
Wed, 16 Sep 2009 09:47:42 +0000 (11:47 +0200)
committerFlorian Forster <octo@noris.net>
Wed, 16 Sep 2009 09:47:42 +0000 (11:47 +0200)
… if both are present. Otherwise, use just the one that is available.

contrib/collection3/lib/Collectd/Graph/Type.pm

index 01c2417..81add72 100644 (file)
@@ -250,7 +250,11 @@ sub getTitle
   my $type_instance = $ident->{'type_instance'};
   my $instance;
 
-  if (defined $type_instance)
+  if ((defined $type_instance) && (defined $plugin_instance))
+  {
+    $instance = "$plugin_instance/$type_instance";
+  }
+  elsif (defined $type_instance)
   {
     $instance = $type_instance;
   }