Changeset 1769

Timestamp:

04/04/08 06:08:04 (23 months ago)

Author:

fumiakiy

Message:

Stopped saving something in the database while database driver is being initialized. Let us see if this fixes the occasional "Time to Upgrade!" bug. BugId:58199

Location:

branches/release-33/lib

Files:

• MT.pm.pre (modified) (1 diff)
• MT/App.pm (modified) (2 diffs)
• MT/ConfigMgr.pm (modified) (4 diffs)
• MT/ObjectDriver/Driver/DBD/Pg.pm (modified) (2 diffs)
• MT/ObjectDriver/Driver/DBD/mysql.pm (modified) (2 diffs)

branches/release-33/lib/MT.pm.pre

@@ -2684 +2684 @@
 }
 
+sub DESTROY {
+    # save_config here so not to miss any dirty config change to persist
+    # particulary for those which does not construct MT::App.
+    $_[0]->config->save_config();
+}
+
 1;
 

branches/release-33/lib/MT/App.pm

@@ -2387 +2387 @@
     }
 
+    # save_config here so not to miss any dirty config change to persist
+    $app->config->save_config();
+
     $app->request->finish;
     delete $app->{request};
@@ -3066 +3069 @@
     MT::Request->finish();
     undef $MT::Object::DRIVER;
+    undef $MT::Object::DBI_DRIVER;
     undef $MT::ConfigMgr::cfg;
 }

branches/release-33/lib/MT/ConfigMgr.pm

@@ -17 +17 @@
 
 sub new {
-    my $mgr = bless { __var => { }, __dbvar => { }, __paths => [] }, $_[0];
+    my $mgr = bless { __var => { }, __dbvar => { }, __paths => [], __dirty => 0 }, $_[0];
     $mgr->init;
     $mgr;
@@ -162 +162 @@
         $mgr->{$set}{$var} = $val;
     }
+    $mgr->set_dirty() if defined($_[2]) && $_[2];
 }
 
@@ -186 +187 @@
 }
 
+sub set_dirty {
+    my $mgr = shift;
+    $mgr = $mgr->instance unless ref($mgr);
+    $mgr->{__dirty} = 1;
+}
+
+sub clear_dirty {
+    my $mgr = shift;
+    $mgr = $mgr->instance unless ref($mgr);
+    $mgr->{__dirty} = 0;
+}
+
+sub is_dirty {
+    my $mgr = shift;
+    $mgr = $mgr->instance unless ref($mgr);
+    $mgr->{__dirty};
+}
+
 sub save_config {
     my $class = shift;
     my $mgr = $class->instance;
+    return 0 unless $mgr->is_dirty();
     my $data = '';
     my $settings = $mgr->{__dbvar};
@@ -220 +240 @@
     $config->data($data);
     $config->save or die $config->errstr;
+    $mgr->clear_dirty;
+    1;
 }
 

branches/release-33/lib/MT/ObjectDriver/Driver/DBD/Pg.pm

@@ -107 +107 @@
         local $@;
         if (!$dbh->do("SET NAMES '" . $c . "'")) {
-            # 'set names' command isn't working for this verison of mysql,
+            # 'set names' command isn't working for this verison of PostgreSQL,
             # assign SQLSetNames to 0 to prevent further errors.
             $cfg->SQLSetNames(0, 1);
-            $cfg->save_config;
             return 0;
         } else {
@@ -117 +116 @@
                 # 'SET NAMES' command, so it's safe to SET NAMES in the future.
                 $cfg->SQLSetNames(1, 1);
-                $cfg->save_config;
             }
         }

branches/release-33/lib/MT/ObjectDriver/Driver/DBD/mysql.pm

@@ -77 +77 @@
                 # 'SET NAMES' command, so it's safe to SET NAMES in the future.
                 $cfg->SQLSetNames(1, 1);
-                $cfg->save_config;
             }
         } else {
@@ -83 +82 @@
             # assign SQLSetNames to 0 to prevent further errors.
             $cfg->SQLSetNames(0, 1);
-            $cfg->save_config;
             return 0;
         }