Close Remote settings DB connections

Made the `RevelancyStore::close` method also close the remote settings
client.  This way we can close things down on Desktop during shutdown
and avoid LateWrite errors that happen when an open SQLite connection is
garbage collected.

Author: bendk

components/relevancy/src/ingest.rs

@@ -170,6 +170,8 @@ mod test {
                 .unwrap_or_else(|| unreachable!("Unexpected request for attachment `{}`", location))
                 .clone())
         }
+
+        fn close(&self) {}
     }
 
     #[test]

components/relevancy/src/lib.rs

@@ -164,7 +164,8 @@ impl<C: rs::RelevancyRemoteSettingsClient> RelevancyStoreInner<C> {
     ///
     /// Calling `close` will interrupt any in-progress queries on other threads.
     pub fn close(&self) {
-        self.db.close()
+        self.db.close();
+        self.client.close();
     }
 
     /// Interrupt any current database queries

components/relevancy/src/rs.rs

@@ -19,6 +19,9 @@ pub(crate) trait RelevancyRemoteSettingsClient {
     /// Fetches a record's attachment from the Suggest Remote Settings
     /// collection.
     fn get_attachment(&self, location: &RemoteSettingsRecord) -> Result<Vec<u8>>;
+
+    /// Close any open resources
+    fn close(&self);
 }
 
 impl RelevancyRemoteSettingsClient for RemoteSettingsClient {
@@ -32,6 +35,10 @@ impl RelevancyRemoteSettingsClient for RemoteSettingsClient {
     fn get_attachment(&self, record: &RemoteSettingsRecord) -> Result<Vec<u8>> {
         Ok(self.get_attachment(record)?)
     }
+
+    fn close(&self) {
+        self.shutdown()
+    }
 }
 
 impl<T: RelevancyRemoteSettingsClient> RelevancyRemoteSettingsClient for &T {
@@ -42,6 +49,10 @@ impl<T: RelevancyRemoteSettingsClient> RelevancyRemoteSettingsClient for &T {
     fn get_attachment(&self, record: &RemoteSettingsRecord) -> Result<Vec<u8>> {
         (*self).get_attachment(record)
     }
+
+    fn close(&self) {
+        (*self).close();
+    }
 }
 
 impl<T: RelevancyRemoteSettingsClient> RelevancyRemoteSettingsClient for std::sync::Arc<T> {
@@ -52,6 +63,10 @@ impl<T: RelevancyRemoteSettingsClient> RelevancyRemoteSettingsClient for std::sy
     fn get_attachment(&self, record: &RemoteSettingsRecord) -> Result<Vec<u8>> {
         (**self).get_attachment(record)
     }
+
+    fn close(&self) {
+        (**self).close()
+    }
 }
 
 #[derive(Clone, Debug, Deserialize)]
@@ -121,5 +136,7 @@ pub mod test {
         fn get_attachment(&self, _record: &RemoteSettingsRecord) -> Result<Vec<u8>> {
             panic!("NullRelavancyRemoteSettingsClient::get_records was called")
         }
+
+        fn close(&self) {}
     }
 }

components/remote_settings/src/client.rs

@@ -360,11 +360,7 @@ impl<C: ApiClient> RemoteSettingsClient<C> {
         Ok(())
     }
 
-    /// Close the client
-    ///
-    /// This is typically used during shutdown.  It closes the underlying SQLite connection used to
-    /// cache records.
-    pub fn close(&self) {
+    pub fn shutdown(&self) {
         self.inner.lock().storage.close();
     }
 

components/remote_settings/src/lib.rs

@@ -164,6 +164,11 @@ impl RemoteSettingsClient {
     pub fn sync(&self) -> ApiResult<()> {
         self.internal.sync()
     }
+
+    /// Shutdown the client, releasing the SQLite connection used to cache records.
+    pub fn shutdown(&self) {
+        self.internal.shutdown()
+    }
 }
 
 impl RemoteSettingsClient {