DBUpgrade2: verhindern, dass $::form->get_standard_dbh eine zweite Verbindung öffnet

Ansonsten sind Deadlocks absolut möglich.

diff --git a/SL/DBUpgrade2.pm b/SL/DBUpgrade2.pm
index eba336fe2c9b636569519ff01fd27fcb62105826..3cdb9a44b9bbce7836e702202ab5303e4a44c03c 100644 (file)
--- a/SL/DBUpgrade2.pm
+++ b/SL/DBUpgrade2.pm
@@ -243,6 +243,7 @@ sub process_perl_script {
   $dbh->begin_work;
 
   # setup dbup_ export vars & run script
   $dbh->begin_work;
 
   # setup dbup_ export vars & run script

+  my $old_dbh       = $::form->set_standard_dbh($dbh);

   my %dbup_myconfig = map { ($_ => $::form->{$_}) } qw(dbname dbuser dbpasswd dbhost dbport dbconnect);
   my $result        = eval {
     SL::DBUpgrade2::Base::execute_script(
   my %dbup_myconfig = map { ($_ => $::form->{$_}) } qw(dbname dbuser dbpasswd dbhost dbport dbconnect);
   my $result        = eval {
     SL::DBUpgrade2::Base::execute_script(


@@ -255,6 +256,8 @@ sub process_perl_script {
 
   my $error = $EVAL_ERROR;
 
 
   my $error = $EVAL_ERROR;
 

+  $::form->set_standard_dbh($old_dbh);
+

   $dbh->rollback if 1 != ($result // -1);
 
   return $error if $self->{return_on_error} && (1 != ($result // -1));
   $dbh->rollback if 1 != ($result // -1);
 
   return $error if $self->{return_on_error} && (1 != ($result // -1));

diff --git a/SL/Form.pm b/SL/Form.pm
index 79ff7034f37d9edc9df2d2eee2e1350cdb90163a..b18bc67b5fcf5902646c04482554ee9e366c5a16 100644 (file)
--- a/SL/Form.pm
+++ b/SL/Form.pm
@@ -1403,6 +1403,14 @@ sub get_standard_dbh {
   return $standard_dbh;
 }
 
   return $standard_dbh;
 }
 

+sub set_standard_dbh {
+  my ($self, $dbh) = @_;
+  my $old_dbh      = $standard_dbh;
+  $standard_dbh    = $dbh;
+
+  return $old_dbh;
+}
+

 sub date_closed {
   $main::lxdebug->enter_sub();
 
 sub date_closed {
   $main::lxdebug->enter_sub();