]> git.proxmox.com Git - pmg-api.git/commitdiff
fix #1679: do not delete old quarantine mails on cluster creation/join
authorDominik Csapak <d.csapak@proxmox.com>
Thu, 1 Mar 2018 15:56:53 +0000 (16:56 +0100)
committerDietmar Maurer <dietmar@proxmox.com>
Fri, 2 Mar 2018 05:12:43 +0000 (06:12 +0100)
we did cleanup the non-clustered spool dirs for the quarantines
which meant that if you create a cluster, all quarantine mails
before that point are deleted, but not removed from the database

instead leave the spool dir where it is, so they can be viewed at
least from the node where they got quarantined

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
PMG/API2/Cluster.pm

index 1fe0ba37b5c855e35dfdc102b4538b76fe5ef13b..40e329ea16e58cd15563467114bc1f98584c2edc 100644 (file)
@@ -59,7 +59,7 @@ sub cluster_join {
 
        my $cid = $cinfo->{'local'}->{cid};
 
-       PMG::MailQueue::create_spooldirs($cid, 1);
+       PMG::MailQueue::create_spooldirs($cid);
 
        PMG::Cluster::sync_config_from_master($cinfo->{master}->{name}, $cinfo->{master}->{ip});
 
@@ -368,7 +368,7 @@ __PACKAGE__->register_method({
 
                PMG::DBTools::init_masterdb($cid);
 
-               PMG::MailQueue::create_spooldirs($cid, 1);
+               PMG::MailQueue::create_spooldirs($cid);
 
                print STDERR "cluster master successfully created\n";
            };