www

commit f712ea8d4020577997889ed109b651b031b407a6
parent 9176118494e47df4df37451d1cb8285240da84ac
Author: Dan Stillman <dstillman@zotero.org>
Date:   Thu, 13 Jan 2011 14:21:19 +0000

- Reestablish database lock after on-idle backup -- the lock was being lost, which allowed Standalone (and other SQLite clients) to corrupt the database
- Don't attempt to backup database on shutdown, since it doesn't seem to work anymore and can delay shutdown
- Change idle backup check timer to 60 seconds from 10 seconds


Diffstat:
M
chrome/content/zotero/xpcom/db.js
 | 
48
++++++++++++++++++------------------------------

1 file changed, 18 insertions(+), 30 deletions(-)
diff --git a/chrome/content/zotero/xpcom/db.js b/chrome/content/zotero/xpcom/db.js
@@ -717,33 +717,13 @@ Zotero.DBConnection.prototype.getNextName = function (table, field, name)
 
 
 /*
- * Shutdown observer -- implements nsIObserver
+ * Implements nsIObserver
  */
 Zotero.DBConnection.prototype.observe = function(subject, topic, data) {
 	switch (topic) {
 		case 'idle':
 			this.backupDatabase();
 			break;
-		
-		case 'xpcom-shutdown':
-			if (this._shutdown) {
-				this._debug('XPCOM already shut down in Zotero.DBConnection.observe()');
-				return;
-			}
-			
-			// NOTE: disabled
-			//var level = this.commitAllTransactions();
-			var level = this.rollbackAllTransactions()
-			if (level) {
-				level = level === true ? '0' : level;
-				this._debug("A transaction in DB '" + this._dbName + "' was still open! (level " + level + ")", 2);
-			}
-			
-			this._shutdown = true;
-			this.closeDatabase();
-			this.backupDatabase();
-			
-			break;
 	}
 }
 
@@ -813,7 +793,7 @@ Zotero.DBConnection.prototype.backupDatabase = function (suffix) {
 	}
 	
 	if (this.transactionInProgress()) {
-		this._debug("Transaction in progress--skipping backup of DB '" + this._dbName + "'", 2);
+		//this._debug("Transaction in progress--skipping backup of DB '" + this._dbName + "'", 2);
 		return false;
 	}
 	
@@ -836,7 +816,6 @@ Zotero.DBConnection.prototype.backupDatabase = function (suffix) {
 		if (backupFile.exists()) {
 			var currentDBTime = file.lastModifiedTime;
 			var lastBackupTime = backupFile.lastModifiedTime;
-			
 			if (currentDBTime == lastBackupTime) {
 				//Zotero.debug("Database '" + this._dbName + "' hasn't changed -- skipping backup");
 				return;
@@ -870,7 +849,15 @@ Zotero.DBConnection.prototype.backupDatabase = function (suffix) {
 		}
 	}
 	
+	// Turn off DB locking before backup and reenable after, since otherwise
+	// the lock is lost
+	var dbLockExclusive = Zotero.Prefs.get('dbLockExclusive');
 	try {
+		if (dbLockExclusive) {
+			Zotero.DB.query("PRAGMA locking_mode=NORMAL");
+		}
+		Zotero.DB.stopDummyStatement();
+		
 		var store = Components.classes["@mozilla.org/storage/service;1"].
 			getService(Components.interfaces.mozIStorageService);
 		store.backupDatabaseFile(file, tmpFile.leafName, file.parent);
@@ -880,6 +867,12 @@ Zotero.DBConnection.prototype.backupDatabase = function (suffix) {
 		Components.utils.reportError(e);
 		return false;
 	}
+	finally {
+		if (dbLockExclusive) {
+			Zotero.DB.query("PRAGMA locking_mode=EXCLUSIVE");
+		}
+		Zotero.DB.startDummyStatement();
+	}
 	
 	// Opened database files can't be moved on Windows, so we have to skip
 	// the extra integrity check (unless we wanted to write two copies of
@@ -940,7 +933,7 @@ Zotero.DBConnection.prototype.backupDatabase = function (suffix) {
 		backupFile.remove(false);
 	}
 	
-	Zotero.debug("Saving " + backupFile.leafName);
+	Zotero.debug("Backed up to " + backupFile.leafName);
 	tmpFile.moveTo(tmpFile.parent, backupFile.leafName);
 	
 	return true;
@@ -1177,14 +1170,9 @@ Zotero.DBConnection.prototype._getDBConnection = function () {
 	// Register idle and shutdown handlers to call this.observe() for DB backup
 	var idleService = Components.classes["@mozilla.org/widget/idleservice;1"]
 			.getService(Components.interfaces.nsIIdleService);
-	idleService.addIdleObserver(this, 10); // 10 minutes
+	idleService.addIdleObserver(this, 60);
 	idleService = null;
 	
-	var observerService = Components.classes["@mozilla.org/observer-service;1"]
-		.getService(Components.interfaces.nsIObserverService);
-	observerService.addObserver(this, "xpcom-shutdown", false);
-	observerService = null;
-	
 	// User-defined functions
 	// TODO: move somewhere else?