Merge pull request #33 from dee-see/sonarsearch-crash

Handle SonarSearch panic
junnlikestea · Dec 8, 2020 · 1375bdc · 1375bdc
2 parents 322b278 + e0ddc83
commit 1375bdc
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/crobat/src/lib.rs b/crobat/src/lib.rs
@@ -22,13 +22,14 @@ pub struct Crobat {
 }
 
 impl Crobat {
-    pub async fn new() -> Self {
+    pub async fn connect() -> Result<Self> {
         trace!("building crobat client");
         let addr = "https://crobat-rpc.omnisint.io";
-        let conn = Crobat::build_tls_client(addr).await.unwrap();
-
-        Self {
-            client: CrobatClient::new(conn),
+        match Crobat::build_tls_client(addr).await {
+            Ok(conn) => Ok(Self {
+                client: CrobatClient::new(conn),
+            }),
+            Err(e) => Err(e),
         }
     }
 

diff --git a/src/sources/sonarsearch.rs b/src/sources/sonarsearch.rs
@@ -23,7 +23,7 @@ impl SonarSearch {
 impl DataSource for SonarSearch {
     async fn run(&self, host: Arc<String>, mut tx: Sender<Vec<String>>) -> Result<()> {
         let mut results = Vec::with_capacity(QUEUE_SIZE);
-        let mut client = Crobat::new().await;
+        let mut client = Crobat::connect().await?;
         let mut subs = client.get_subs(host.clone()).await?;
 
         while let Some(r) = subs.next().await {