[PATCH] ds389/ds389log: simplify metrics data structure

[Marko Myllynen <myllynen@xxxxxxxxxx>]

Fixes a pasto/braino.
---
 src/pmdas/ds389/pmdads389.pl       |    6 ++----
 src/pmdas/ds389log/pmdads389log.pl |   13 +++++--------
 2 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/src/pmdas/ds389/pmdads389.pl b/src/pmdas/ds389/pmdads389.pl
index c4ecec5..901cc8d 100644
--- a/src/pmdas/ds389/pmdads389.pl
+++ b/src/pmdas/ds389/pmdads389.pl
@@ -66,7 +66,6 @@ sub ds389_process_entry {
        my $currtime;
 
        foreach my $attr ($entry->attributes) {
-               my @metric;
                my $value = $entry->get_value($attr);
 
                if ($attr eq 'currenttime') {
@@ -80,8 +79,7 @@ sub ds389_process_entry {
                        $attr = 'uptime';
                }
 
-               @metric = ('ds389.' . $prefix . $attr, $value);
-               $metrics{$metric[0]} = \@metric;
+               $metrics{'ds389.' . $prefix . $attr} = $value;
        }
 }
 
@@ -131,7 +129,7 @@ sub ds389_fetch_callback {
 
        if (!defined($value))           { return (PM_ERR_APPVERSION, 0); }
 
-       return ($value->[1], 1);
+       return ($value, 1);
 }
 
 $pmda = PCP::PMDA->new('ds389', 130);
diff --git a/src/pmdas/ds389log/pmdads389log.pl 
b/src/pmdas/ds389log/pmdads389log.pl
index dcea107..890a5ed 100644
--- a/src/pmdas/ds389log/pmdads389log.pl
+++ b/src/pmdas/ds389log/pmdads389log.pl
@@ -106,7 +106,6 @@ sub ds389log_fetch {
         my $errors = 0; # combined
         foreach my $line (@stats) {
                 my $key;
-                my @metric;
 
                 if ($line =~ /^.*:/ || $line =~ /^U1/ || $line =~ /^B1/) {
                         $key = $&;
@@ -132,14 +131,13 @@ sub ds389log_fetch {
                                 my $id = 'ds389log.' . $data{$key}[1] . '.' . 
$data{$key}[0];
 
                                 if ($data{$key}[4] eq 1) {
-                                        my $prev = $metrics{$id}[1];
+                                        my $prev = $metrics{$id};
                                         $value = $prev if $prev > $value;
                                 } else {
-                                        $value = $metrics{$id}[1] + $value;
+                                        $value = $metrics{$id} + $value;
                                 }
 
-                                @metric = ($id , $value);
-                                $metrics{$id} = \@metric;
+                                $metrics{$id} = $value;
                         }
                 }
         }
@@ -155,7 +153,7 @@ sub ds389log_fetch_callback {
 
         if (!defined($value))                { return (PM_ERR_APPVERSION, 0); }
 
-        return ($value->[1], 1);
+        return ($value, 1);
 }
 
 $pmda = PCP::PMDA->new('ds389log', 131);
@@ -167,8 +165,7 @@ foreach my $key (keys %data) {
                         PM_TYPE_U32, PM_INDOM_NULL, PM_SEM_COUNTER,
                         pmda_units(0,0,1,0,0,PM_COUNT_ONE),
                         $name, '', '');
-        my @value = ($name, 0);
-        $metrics{$name} = \@value;
+        $metrics{$name} = 0;
 }
 
 $pmda->set_refresh(\&ds389log_fetch);
-- 
1.7.1