Simplify client creation.

diff --git a/src/persistence.rs b/src/persistence.rs
index 8e299ee202e48dbf0d700e4c278462e132b7338b..857cbc34da21f71525dd4020a947f8ea80985a0f 100644 (file)
--- a/src/persistence.rs
+++ b/src/persistence.rs
@@ -1,7 +1,6 @@
 use std::fs::OpenOptions;
 use std::io::{BufWriter, Write};
 use std::ops::Deref;
-use std::mem;
 use std::sync::Arc;
 use std::time::{Duration, Instant};
 use lightning::log_info;
@@ -38,10 +37,10 @@ impl<L: Deref> GossipPersister<L> where L::Target: Logger {
        }
 
        pub(crate) async fn persist_gossip(&mut self) {
-               let mut client = crate::connect_to_db().await;
+               { // initialize the database
+                       // this client instance is only used once
+                       let mut client = crate::connect_to_db().await;
 
-               {
-                       // initialize the database
                        let initialization = client
                                .execute(config::db_config_table_creation_query(), &[])
                                .await;
@@ -122,6 +121,16 @@ impl<L: Deref> GossipPersister<L> where L::Target: Logger {
                        insert_limiter.acquire().await.unwrap().forget();
 
                        let limiter_ref = Arc::clone(&insert_limiter);
+                       let client = {
+                               let mut connections_set = connections_cache.lock().await;
+                               let client = if connections_set.is_empty() {
+                                       crate::connect_to_db().await
+                               } else {
+                                       connections_set.pop().unwrap()
+                               };
+                               client
+                       };
+
                        let connections_cache_ref = Arc::clone(&connections_cache);
                        match gossip_message {
                                GossipMessage::ChannelAnnouncement(announcement, seen_override) => {
@@ -132,16 +141,6 @@ impl<L: Deref> GossipPersister<L> where L::Target: Logger {
                                        announcement.write(&mut announcement_signed).unwrap();
 
                                        let _task = self.tokio_runtime.spawn(async move {
-                                               let client;
-                                               {
-                                                       let mut connections_set = connections_cache_ref.lock().await;
-                                                       if connections_set.is_empty() {
-                                                               mem::drop(connections_set);
-                                                               client = crate::connect_to_db().await;
-                                                       } else {
-                                                               client = connections_set.pop().unwrap();
-                                                       }
-                                               }
                                                if cfg!(test) && seen_override.is_some() {
                                                        tokio::time::timeout(POSTGRES_INSERT_TIMEOUT, client
                                                                .execute("INSERT INTO channel_announcements (\
@@ -224,16 +223,6 @@ impl<L: Deref> GossipPersister<L> where L::Target: Logger {
                                        let _seen_timestamp = seen_override.unwrap_or(timestamp as u32) as f64;
 
                                        let _task = self.tokio_runtime.spawn(async move {
-                                               let client;
-                                               {
-                                                       let mut connections_set = connections_cache_ref.lock().await;
-                                                       if connections_set.is_empty() {
-                                                               mem::drop(connections_set);
-                                                               client = crate::connect_to_db().await;
-                                                       } else {
-                                                               client = connections_set.pop().unwrap();
-                                                       }
-                                               }
                                                tokio::time::timeout(POSTGRES_INSERT_TIMEOUT, client
                                                        .execute(insertion_statement, &[
                                                                &scid,