zpool: cleanup zfs_request command a bit

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>

diff --git a/PVE/Storage/ZFSPoolPlugin.pm b/PVE/Storage/ZFSPoolPlugin.pm
index 9ba3999c57e214c093aff8f8f08050006825494d..7315c0c7453525d46e8ca2ea66513375504fe511 100644 (file)
--- a/PVE/Storage/ZFSPoolPlugin.pm
+++ b/PVE/Storage/ZFSPoolPlugin.pm
@@ -167,8 +167,6 @@ sub path {
 sub zfs_request {
     my ($class, $scfg, $timeout, $method, @params) = @_;
 
-    my $default_timeout = PVE::RPCEnvironment->is_worker() ? 60*60 : 5;
-
     my $cmd = [];
 
     if ($method eq 'zpool_list') {
@@ -179,17 +177,12 @@ sub zfs_request {
     } else {
        push @$cmd, 'zfs', $method;
     }
-
     push @$cmd, @params;
- 
-    my $msg = '';
 
-    my $output = sub {
-        my $line = shift;
-        $msg .= "$line\n";
-    };
+    my $msg = '';
+    my $output = sub { $msg .= "$_[0]\n" };
 
-    $timeout =  $default_timeout if !$timeout;
+    $timeout = PVE::RPCEnvironment->is_worker() ? 60*60 : 5 if !$timeout;
 
     run_command($cmd, errmsg => "zfs error", outfunc => $output, timeout => $timeout);