DB-Upgrade: Dauer jedes Upgrade-Scripts timen

diff --git a/SL/DBUpgrade2.pm b/SL/DBUpgrade2.pm
index bd65a1ac74eefe77451451837f12503aa275efb8..82bd27f259ad644d7880af4ae26a55a04f6e661e 100644 (file)
--- a/SL/DBUpgrade2.pm
+++ b/SL/DBUpgrade2.pm
@@ -291,8 +291,12 @@ sub process_perl_script {
 sub process_file {
   my ($self, $dbh, $filename, $version_or_control) = @_;
 
 sub process_file {
   my ($self, $dbh, $filename, $version_or_control) = @_;
 

-  return $filename =~ m/sql$/ ? $self->process_query(      $dbh, $filename, $version_or_control)
-                              : $self->process_perl_script($dbh, $filename, $version_or_control);
+  my $result = $filename =~ m/sql$/ ? $self->process_query(      $dbh, $filename, $version_or_control)
+                                    : $self->process_perl_script($dbh, $filename, $version_or_control);
+
+  $::lxdebug->log_time("DB upgrade script '${filename}' finished");
+
+  return $result;

 }
 
 sub unapplied_upgrade_scripts {
 }
 
 sub unapplied_upgrade_scripts {


@@ -338,6 +342,8 @@ sub apply_admin_dbupgrade_scripts {
 
   print $self->{form}->parse_html_template("dbupgrade/header", { dbname => $::auth->{DB_config}->{db} });
 
 
   print $self->{form}->parse_html_template("dbupgrade/header", { dbname => $::auth->{DB_config}->{db} });
 

+  $::lxdebug->log_time("DB upgrades commencing");
+

   foreach my $control (@unapplied_scripts) {
     $::lxdebug->message(LXDebug->DEBUG2(), "Applying Update $control->{file}");
     print $self->{form}->parse_html_template("dbupgrade/upgrade_message2", $control);
   foreach my $control (@unapplied_scripts) {
     $::lxdebug->message(LXDebug->DEBUG2(), "Applying Update $control->{file}");
     print $self->{form}->parse_html_template("dbupgrade/upgrade_message2", $control);


@@ -345,6 +351,8 @@ sub apply_admin_dbupgrade_scripts {
     $self->process_file($dbh, "sql/Pg-upgrade2-auth/$control->{file}", $control);
   }
 
     $self->process_file($dbh, "sql/Pg-upgrade2-auth/$control->{file}", $control);
   }
 

+  $::lxdebug->log_time("DB upgrades finished");
+

   print $self->{form}->parse_html_template("dbupgrade/footer", { is_admin => 1 }) if $called_from_admin;
 
   return 1;
   print $self->{form}->parse_html_template("dbupgrade/footer", { is_admin => 1 }) if $called_from_admin;
 
   return 1;

diff --git a/SL/User.pm b/SL/User.pm
index 593707c82c0523e9ce9ec4b5f357bf75487feca2..f324e3629694f584e6413150e1d6b7e4224b5164 100644 (file)
--- a/SL/User.pm
+++ b/SL/User.pm
@@ -443,6 +443,8 @@ sub dbupdate2 {
 
   my @upgradescripts = $dbupdater->unapplied_upgrade_scripts($dbh);
 
 
   my @upgradescripts = $dbupdater->unapplied_upgrade_scripts($dbh);
 

+  $::lxdebug->log_time("DB upgrades commencing");
+

   foreach my $control (@upgradescripts) {
     # Apply upgrade. Control will only return to us if the upgrade has
     # been applied correctly and if the update has not requested user
   foreach my $control (@upgradescripts) {
     # Apply upgrade. Control will only return to us if the upgrade has
     # been applied correctly and if the update has not requested user


@@ -453,6 +455,8 @@ sub dbupdate2 {
     $dbupdater->process_file($dbh, "sql/Pg-upgrade2/$control->{file}", $control);
   }
 
     $dbupdater->process_file($dbh, "sql/Pg-upgrade2/$control->{file}", $control);
   }
 

+  $::lxdebug->log_time("DB upgrades finished");
+

   $dbh->disconnect;
 }
 
   $dbh->disconnect;
 }