factor out format_uptime

diff --git a/PMG/CLI/pmgcm.pm b/PMG/CLI/pmgcm.pm
index 7d4e0b33a91407d459f3607daf029983f38063b1..53791e555db13519062a496fc5f6278cb06e2598 100644 (file)
--- a/PMG/CLI/pmgcm.pm
+++ b/PMG/CLI/pmgcm.pm
@@ -12,6 +12,7 @@ use PVE::Tools qw(extract_param);
 use PVE::INotify;
 use PVE::CLIHandler;
 
+use PMG::Utils;
 use PMG::Ticket;
 use PMG::RESTEnvironment;
 use PMG::DBTools;
@@ -56,20 +57,7 @@ my $format_nodelist = sub {
            $state = "ERROR: $err";
        }
 
-       my $uptime = '-';
-       if (my $ut = $ni->{uptime}) {
-           my $days = int($ut/86400);
-           $ut -= $days*86400;
-           my $hours = int($ut/3600);
-           $ut -= $hours*3600;
-           my $mins = $ut/60;
-           if ($days) {
-               my $ds = $days > 1 ? 'days' : 'day';
-               $uptime = sprintf "%d $ds %02d:%02d", $days, $hours, $mins;
-           } else {
-               $uptime = sprintf "%02d:%02d", $hours, $mins;
-           }
-       }
+       my $uptime = $ni->{uptime} ? PMG::Utils::format_uptime($ni->{uptime}) : '-';
 
        my $loadavg1 = '-';
        if (my $d = $ni->{loadavg}) {

diff --git a/PMG/Utils.pm b/PMG/Utils.pm
index 3d4e2fea9e1e6d6f1c777cd1f5d8bb26dda34487..5f6974fc9e1b67a92fa6b89e0ce5175fa457dabc 100644 (file)
--- a/PMG/Utils.pm
+++ b/PMG/Utils.pm
@@ -976,4 +976,23 @@ sub load_sa_descriptions {
     return $res;
 }
 
+sub format_uptime {
+    my ($uptime) = @_;
+
+    my $days = int($uptime/86400);
+    $uptime -= $days*86400;
+
+    my $hours = int($uptime/3600);
+    $uptime -= $hours*3600;
+
+    my $mins = $uptime/60;
+
+    if ($days) {
+       my $ds = $days > 1 ? 'days' : 'day';
+       return sprintf "%d $ds %02d:%02d", $days, $hours, $mins;
+    } else {
+       return sprintf "%02d:%02d", $hours, $mins;
+    }
+}
+
 1;