close #1917: add pmg-system-report command

[pmg-api.git] / PMG / Postfix.pm

diff --git a/PMG/Postfix.pm b/PMG/Postfix.pm
index 5437548b30e77fcb29c0ae73b578d99cf00e7133..1a86e90489c842d9c4af8cc220d016143ee1e01d 100644 (file)
--- a/PMG/Postfix.pm
+++ b/PMG/Postfix.pm
@@ -107,16 +107,16 @@ sub qshape {
            push @$res, {
                domain => $d[0],
                total => $d[1],
-               '5s' => $d[2],
-               '10s' => $d[3],
-               '20s' => $d[4],
-               '40s' => $d[5],
-               '80s' => $d[6],
-               '160s' => $d[7],
-               '320s' => $d[8],
-               '640s' => $d[9],
-               '1280s' => $d[10],
-               '1280s+' => $d[11],
+               '5m' => $d[2],
+               '10m' => $d[3],
+               '20m' => $d[4],
+               '40m' => $d[5],
+               '80m' => $d[6],
+               '160m' => $d[7],
+               '320m' => $d[8],
+               '640m' => $d[9],
+               '1280m' => $d[10],
+               '1280m+' => $d[11],
            };
        }
     }
@@ -184,7 +184,7 @@ sub postcat {
     return $res;
 }
 
-# flush all queues
+# flush all queuespostconf -d|grep enable_long_queue_ids
 sub flush_queues {
     PVE::Tools::run_command(['/usr/sbin/postqueue', '-f']);
 }
@@ -205,7 +205,10 @@ sub delete_queued_mail {
 sub delete_queue {
     my ($queue) = @_;
 
-    PVE::Tools::run_command(['/usr/sbin/postsuper', '-d', 'ALL', $queue]);
+    my $cmd = ['/usr/sbin/postsuper', '-d', 'ALL'];
+    push @$cmd, $queue if defined($queue);
+
+    PVE::Tools::run_command($cmd);
 }
 
 sub discard_verify_cache {