Do not have the VAC daemon re-use the "masterdbh" name as this can lead to a race...

diff --git a/Bucardo.pm b/Bucardo.pm
index 860944bc354efe14c196b0e6eb6491a7f1c2eaaf..fc587f72d741e001a7ba901f14deffca7683e95f 100644 (file)
--- a/Bucardo.pm
+++ b/Bucardo.pm
@@ -6454,7 +6454,7 @@ sub fork_vac {
         $self->glog(qq{${warn}VAC was killed at line $line: $diemsg}, LOG_WARN);
 
         ## Not a whole lot of cleanup to do on this one: just shut database connections and leave
-        $self->{masterdbh}->disconnect();
+        $self->{masterdbhvac}->disconnect();
 
         ## Remove our pid file
         unlink $self->{vacpidfile} or $self->glog("Warning! Failed to unlink $self->{vacpidfile}", LOG_WARN);
@@ -6464,8 +6464,8 @@ sub fork_vac {
     }; ## end SIG{__DIE_} handler sub
 
     ## Connect to the master database (overwriting the pre-fork MCP connection)
-    ($self->{master_backend}, $self->{masterdbh}) = $self->connect_database();
-    my $maindbh = $self->{masterdbh};
+    ($self->{master_backend}, $self->{masterdbhvac}) = $self->connect_database();
+    my $maindbh = $self->{masterdbhvac};
     $self->glog("Bucardo database backend PID: $self->{master_backend}", LOG_VERBOSE);
 
     ## Map the PIDs to common names for better log output