X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2Fbin%2Ffreeside-upgrade;h=7ee35c68d1a15dcb74f4fbdf4d8c395fee2c26b8;hb=c6ba0fa6271880599ce3d60dcd23de248526f0b8;hp=85bf68af611a9bf7a97fac7f0acabf50a24ed4fb;hpb=3eea1ba4701cbf02716238b4998216f67ef52ade;p=freeside.git

diff --git a/FS/bin/freeside-upgrade b/FS/bin/freeside-upgrade
index 85bf68af6..7ee35c68d 100755
--- a/FS/bin/freeside-upgrade
+++ b/FS/bin/freeside-upgrade
@@ -1,7 +1,7 @@
 #!/usr/bin/perl -w
 
 use strict;
-use vars qw($opt_d $opt_s $opt_q $opt_v);
+use vars qw($opt_d $opt_s $opt_q $opt_v $opt_r);
 use vars qw($DEBUG $DRY_RUN);
 use Getopt::Std;
 use DBIx::DBSchema 0.31;
@@ -13,9 +13,11 @@ use FS::Conf;
 use FS::Record qw(qsearch);
 use FS::Upgrade qw(upgrade upgrade_sqlradius);
 
+my $start = time;
+
 die "Not running uid freeside!" unless checkeuid();
 
-getopts("dqs");
+getopts("dqrs");
 
 $DEBUG = !$opt_q;
 #$DEBUG = $opt_v;
@@ -36,6 +38,9 @@ dbdef_create($dbh, $dbdef_file);
 delete $FS::Schema::dbdef_cache{$dbdef_file}; #force an actual reload
 reload_dbdef($dbdef_file);
 
+warn "Upgrade startup completed in ". (time-$start). " seconds\n"; # if $DEBUG;
+$start = time;
+
 $DBIx::DBSchema::DEBUG = $DEBUG;
 $DBIx::DBSchema::Table::DEBUG = $DEBUG;
 $DBIx::DBSchema::Index::DEBUG = $DEBUG;
@@ -65,36 +70,50 @@ if ( $DRY_RUN ) {
       or die "Error: ". $dbh->errstr. "\n executing: $statement";
   }
 
+  warn "Pre-schema change upgrades completed in ". (time-$start). " seconds\n"; # if $DEBUG;
+  $start = time;
+
   dbdef->update_schema( dbdef_dist(datasrc), $dbh );
 }
 
+warn "Schema upgrade completed in ". (time-$start). " seconds\n"; # if $DEBUG;
+$start = time;
+
 my $hashref = {};
 $hashref->{dry_run} = 1 if $DRY_RUN;
-$hashref->{debug} = 1 if $DEBUG;
-if ( $DRY_RUN ) {
-  print join "\n", prune_applications($hashref) unless $opt_s;
-} else {
-  prune_applications($hashref) unless $opt_s;
-}
-print "\n" if $DRY_RUN;
+$hashref->{debug} = 1 if $DEBUG && $DRY_RUN;
+prune_applications($hashref) unless $opt_s;
 
-if ( $dbh->{Driver}->{Name} =~ /^mysql/i && ! $opt_s ) {
+warn "Application pruning completed in ". (time-$start). " seconds\n"; # if $DEBUG;
+$start = time;
 
-  my $sth = $dbh->prepare(
-    "SELECT COUNT(*) FROM duplicate_lock WHERE lockname = 'svc_acct'"
-  ) or die $dbh->errstr;
+print "\n" if $DRY_RUN;
 
-  $sth->execute or die $sth->errstr;
+if ( $dbh->{Driver}->{Name} =~ /^mysql/i && ! $opt_s ) {
 
-  unless ( $sth->fetchrow_arrayref->[0] ) {
+  foreach my $table (qw( svc_acct svc_phone )) {
 
-    $sth = $dbh->prepare(
-      "INSERT INTO duplicate_lock ( lockname ) VALUES ( 'svc_acct' )"
+    my $sth = $dbh->prepare(
+      "SELECT COUNT(*) FROM duplicate_lock WHERE lockname = '$table'"
     ) or die $dbh->errstr;
 
     $sth->execute or die $sth->errstr;
 
+    unless ( $sth->fetchrow_arrayref->[0] ) {
+
+      $sth = $dbh->prepare(
+        "INSERT INTO duplicate_lock ( lockname ) VALUES ( '$table' )"
+      ) or die $dbh->errstr;
+
+      $sth->execute or die $sth->errstr;
+
+    }
+
   }
+
+  warn "Duplication lock creation completed in ". (time-$start). " seconds\n"; # if $DEBUG;
+  $start = time;
+
 }
 
 $dbh->commit or die $dbh->errstr;
@@ -108,7 +127,7 @@ $FS::UID::AutoCommit = 0;
 $FS::UID::callback_hack = 1;
 $dbh = adminsuidsetup($user);
 $FS::UID::callback_hack = 0;
-unless ( $DRY_RUN ) {
+unless ( $DRY_RUN || $opt_s ) {
   my $dir = "%%%FREESIDE_CONF%%%/conf.". datasrc;
   if (!scalar(qsearch('conf', {}))) {
     my $error = FS::Conf::init_config($dir);
@@ -124,15 +143,26 @@ $dbh->disconnect or die $dbh->errstr;
 
 $dbh = adminsuidsetup($user);
 
+warn "Re-initialization with updated schema completed in ". (time-$start). " seconds\n"; # if $DEBUG;
+$start = time;
+
 upgrade()
   unless $DRY_RUN || $opt_s;
 
+warn "Table updates completed in ". (time-$start). " seconds\n"; # if $DEBUG;
+$start = time;
+
 upgrade_sqlradius()
-  unless $DRY_RUN || $opt_s;
+  unless $DRY_RUN || $opt_s || $opt_r;
+
+warn "SQL RADIUS updates completed in ". (time-$start). " seconds\n"; # if $DEBUG;
+$start = time;
 
 $dbh->commit or die $dbh->errstr;
 $dbh->disconnect or die $dbh->errstr;
 
+warn "Commit and disconnection completed in ". (time-$start). " seconds; upgrade done!\n"; # if $DEBUG;
+
 ###
 
 sub dbdef_create { # reverse engineer the schema from the DB and save to file
@@ -142,7 +172,7 @@ sub dbdef_create { # reverse engineer the schema from the DB and save to file
 }
 
 sub usage {
-  die "Usage:\n  freeside-upgrade [ -d ] [ -s ] [ -q | -v ] user\n"; 
+  die "Usage:\n  freeside-upgrade [ -d ] [ -r ] [ -s ] [ -q | -v ] user\n"; 
 }
 
 =head1 NAME
@@ -151,7 +181,7 @@ freeside-upgrade - Upgrades database schema for new freeside verisons.
 
 =head1 SYNOPSIS
 
-  freeside-upgrade [ -d ] [ -s ] [ -q | -v ]
+  freeside-upgrade [ -d ] [ -r ] [ -s ] [ -q | -v ]
 
 =head1 DESCRIPTION
 
@@ -173,6 +203,9 @@ Also performs other upgrade functions:
 
   [ -q ]: Run quietly.  This may become the default at some point.
 
+  [ -r ]: Skip sqlradius updates.  Useful for occassions where the sqlradius
+          databases may be inaccessible.
+
   [ -v ]: Run verbosely, sending debugging information to STDERR.  This is the
           current default.