SF.net SVN: ledger-smb:[6908] branches/1.3

[..hidden..]

Revision: 6908
          http://sourceforge.net/p/ledger-smb/code/6908
Author:   einhverfr
Date:     2014-02-27 06:11:38 +0000 (Thu, 27 Feb 2014)
Log Message:
-----------
Fixes for zero-downtime upgrade error handling

Modified Paths:
--------------
    branches/1.3/LedgerSMB/Form.pm
    branches/1.3/LedgerSMB.pm

Modified: branches/1.3/LedgerSMB/Form.pm
===================================================================
--- branches/1.3/LedgerSMB/Form.pm	2014-02-27 05:56:47 UTC (rev 6907)
+++ branches/1.3/LedgerSMB/Form.pm	2014-02-27 06:11:38 UTC (rev 6908)
@@ -1388,6 +1388,7 @@
            { AutoCommit => 0, pg_enable_utf8 => 1, pg_server_prepare => 0 })
         || LedgerSMB::Auth::credential_prompt();
 
+    $LedgerSMB::App_State::DBH = $self->{dbh};
     $logger->debug("acquired dbh \$self->{dbh}=$self->{dbh}");
     my $dbh = $self->{dbh};
 

Modified: branches/1.3/LedgerSMB.pm
===================================================================
--- branches/1.3/LedgerSMB.pm	2014-02-27 05:56:47 UTC (rev 6907)
+++ branches/1.3/LedgerSMB.pm	2014-02-27 06:11:38 UTC (rev 6908)
@@ -990,6 +990,8 @@
         qq|dbi:Pg:dbname="$dbname"|, "$creds->{login}", "$creds->{password}",
         { AutoCommit => 0, pg_server_prepare => 0, pg_enable_utf8 => 1 }
     ); 
+    $LedgerSMB::App_State::DBH = $self->{dbh};
+    $LedgerSMB::App_State::DBName = $dbname;
     $logger->debug("DBI->connect dbh=$self->{dbh}");
     my $dbi_trace=$LedgerSMB::Sysconfig::DBI_TRACE;
     if($dbi_trace)
@@ -1009,8 +1011,6 @@
     elsif (!$self->{dbh}){
         $self->_get_password;
     }
-    $LedgerSMB::App_State::DBH = $self->{dbh};
-    $LedgerSMB::App_State::DBName = $dbname;
 
     # This is the general version check
     my $sth = $self->{dbh}->prepare("

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.


------------------------------------------------------------------------------
Flow-based real-time traffic analytics software. Cisco certified tool.
Monitor traffic, SLAs, QoS, Medianet, WAAS etc. with NetFlow Analyzer
Customize your own dashboards, set traffic alerts and generate reports.
Network behavioral analysis & security monitoring. All-in-one tool.
http://pubads.g.doubleclick.net/gampad/clk?id=126839071&iu=/4140/ostg.clktrk
_______________________________________________
Ledger-smb-commits mailing list
..hidden..
https://lists.sourceforge.net/lists/listinfo/ledger-smb-commits