move get_full_service_state to PMG::Utils

diff --git a/PMG/API2/Services.pm b/PMG/API2/Services.pm
index ec2d1a8e2627b13dc9f6ec48427c5c0db3812411..13fcb58f9bea74e1a39e2db34f70d55c1a619aae 100644 (file)
--- a/PMG/API2/Services.pm
+++ b/PMG/API2/Services.pm
@@ -30,24 +30,6 @@ my $service_name_list = [
     'pmg-daily',
     ];
 
-my $get_full_service_state = sub {
-    my ($service) = @_;
-
-    my $res;
-
-    my $parser = sub {
-       my $line = shift;
-       if ($line =~ m/^([^=\s]+)=(.*)$/) {
-           $res->{$1} = $2;
-       }
-    };
-
-    $service = 'postfix@-' if $service eq 'postfix';
-    PVE::Tools::run_command(['systemctl', 'show', $service], outfunc => $parser);
-
-    return $res;
-};
-
 my $static_service_list;
 
 sub get_service_list {
@@ -57,7 +39,7 @@ sub get_service_list {
     my $list = {};
     foreach my $name (@$service_name_list) {
        my $ss;
-       eval { $ss = &$get_full_service_state($name); };
+       eval { $ss = PMG::Utils::get_full_service_state($name); };
        warn $@ if $@;
        next if !$ss;
        next if !defined($ss->{Description});
@@ -80,7 +62,7 @@ my $service_state = sub {
     my ($service) = @_;
 
     my $ss;
-    eval { $ss = &$get_full_service_state($service); };
+    eval { $ss = PMG::Utils::get_full_service_state($service); };
     if (my $err = $@) {
        return 'unknown';
     }

diff --git a/PMG/Utils.pm b/PMG/Utils.pm
index 749e90cd23d9384d5602176336225260bd48b647..fbc25eb7a93ccb0321b63beb2636c635a66f98f9 100644 (file)
--- a/PMG/Utils.pm
+++ b/PMG/Utils.pm
@@ -483,6 +483,24 @@ sub find_local_network_for_ip {
     die "unable to detect local network for ip '$ip'\n";
 }
 
+sub get_full_service_state {
+    my ($service) = @_;
+
+    my $res;
+
+    my $parser = sub {
+       my $line = shift;
+       if ($line =~ m/^([^=\s]+)=(.*)$/) {
+           $res->{$1} = $2;
+       }
+    };
+
+    $service = 'postfix@-' if $service eq 'postfix';
+    PVE::Tools::run_command(['systemctl', 'show', $service], outfunc => $parser);
+
+    return $res;
+}
+
 sub service_cmd {
     my ($service, $cmd) = @_;