Merge pull request #1304 from mozilla/no-expect-places-drop

Avoid panicing when closing places db.
mozilla · Jun 14, 2019 · 15ea0ec · 15ea0ec
2 parents 12880b7 + 648294d
commit 15ea0ec
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 5 deletions.
diff --git a/CHANGES_UNRELEASED.md b/CHANGES_UNRELEASED.md
@@ -3,3 +3,13 @@
 # Unreleased Changes
 
 [Full Changelog](https://github.com/mozilla/application-services/compare/v0.31.2...master)
+
+## Places
+
+### What's fixed
+
+- Fix an error that could happen when the place database is closed.
+  ([#1304](https://github.com/mozilla/application-services/pull/1304))
+
+- iOS only: Ensure interruption errors don't come through as network errors.
+  ([#1304](https://github.com/mozilla/application-services/pull/1304))
diff --git a/components/logins/src/ffi.rs b/components/logins/src/ffi.rs
@@ -35,8 +35,8 @@ pub mod error_codes {
     /// A request to the sync server failed.
     pub const NETWORK: i32 = 6;
 
-    /// A request to the sync server failed.
-    pub const INTERRUPTED: i32 = 6;
+    /// An operation has been interrupted.
+    pub const INTERRUPTED: i32 = 7;
 }
 
 fn get_code(err: &Error) -> ErrorCode {

diff --git a/components/places/src/db/db.rs b/components/places/src/db/db.rs
@@ -156,9 +156,10 @@ impl Drop for PlacesDb {
     fn drop(&mut self) {
         // In line with both the recommendations from SQLite and the behavior of places in
         // Database.cpp, we run `PRAGMA optimize` before closing the connection.
-        self.db
-            .execute_batch("PRAGMA optimize(0x02);")
-            .expect("PRAGMA optimize should always succeed!");
+        let res = self.db.execute_batch("PRAGMA optimize(0x02);");
+        if let Err(e) = res {
+            log::warn!("Failed to execute pragma optimize (DB locked?): {}", e);
+        }
     }
 }