Changeset 8236 for lang/perl/App-MadEye

Timestamp:

03/21/08 11:40:09 (9 months ago)

Author:

tokuhirom

Message:

snmp_session() 関数をつかってすっきりさす

Files:

• lang/perl/App-MadEye/trunk/lib/App/MadEye/Plugin/Agent/SNMP/Disk.pm (modified) (3 diffs)

lang/perl/App-MadEye/trunk/lib/App/MadEye/Plugin/Agent/SNMP/Disk.pm

@@ -3 +3 @@
 use warnings;
 use App::MadEye::Plugin::Agent::Base;
-use Net::SNMP;
+use App::MadEye::Util;
 
 my $oid_map = {
@@ -17 +17 @@
 
     my $threshold = $self->config->{config}->{threshold} or die "missing threshold";
-    my $community = $self->config->{config}->{community} or die "missing community";
-    my $port      = $self->config->{config}->{port}    || 161;
-    my $timeout   = $self->config->{config}->{timeout} || 10;
 
-    my $session = open_session($host, $community, $port, $timeout);
-    my $response = fetch_data($session);
-    $session->close();
+    my $response = snmp_session(
+        $self,
+        $host => sub {
+            my $session = shift;
+
+            return +{
+                map {
+                    $_ => (
+                        $session->get_table(
+                            -baseoid => $oid_map->{$_},
+                        ) or die "cannot get a $_ : " . $session->error
+                    )
+                }
+                qw/hrStorageDescr hrStorageUsed hrStorageType hrStorageSize/
+            };
+        },
+    );
 
     my $result = '';
@@ -37 +48 @@
     });
     return $result;
-}
-
-sub open_session {
-    my ($host, $community, $port, $timeout) = @_;
-    my ($session, $error) = Net::SNMP->session(
-        -hostname  => $host,
-        -community => $community,
-        -port      => $port,
-        -timeout   => $timeout,
-    );
-    if (!defined($session)) {
-        warn "ERROR: $error.\n";
-    }
-    $session;
-}
-
-sub fetch_data {
-    my $session = shift;
-
-    return +{
-        map {
-            $_ => (
-                $session->get_table(
-                    -baseoid => $oid_map->{$_},
-                ) or die "cannot get a $_ : " . $session->error
-            )
-        }
-        qw/hrStorageDescr hrStorageUsed hrStorageType hrStorageSize/
-    };
 }