From 51b4c3dbc94e18279251dc5d69e4677c8523a164 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Fri, 22 May 2020 19:29:59 +0200
Subject: [PATCH] convert log-message-collector to easylapin

---
 ofborg/src/bin/log-message-collector.rs | 116 +++++++++++-------------
 1 file changed, 55 insertions(+), 61 deletions(-)

diff --git a/ofborg/src/bin/log-message-collector.rs b/ofborg/src/bin/log-message-collector.rs
index a9e5cef..175eeb0 100644
--- a/ofborg/src/bin/log-message-collector.rs
+++ b/ofborg/src/bin/log-message-collector.rs
@@ -1,78 +1,72 @@
-use ofborg::config;
-use ofborg::easyamqp::{self, ChannelExt, ConsumerExt};
-use ofborg::tasks;
-use ofborg::worker;
-
 use std::env;
+use std::error::Error;
 use std::path::PathBuf;
 
+use async_std::task;
 use tracing::info;
 
-fn main() {
-    let cfg = config::load(env::args().nth(1).unwrap().as_ref());
+use ofborg::config;
+use ofborg::easyamqp::{self, ChannelExt, ConsumerExt};
+use ofborg::easylapin;
+use ofborg::tasks;
+
+fn main() -> Result<(), Box<dyn Error>> {
     ofborg::setup_log();
 
-    let mut session = easyamqp::session_from_config(&cfg.rabbitmq).unwrap();
-    info!("Connected to rabbitmq");
+    let arg = env::args()
+        .nth(1)
+        .expect("usage: log-message-collector <config>");
+    let cfg = config::load(arg.as_ref());
 
-    let mut channel = session.open_channel(1).unwrap();
+    let conn = easylapin::from_config(&cfg.rabbitmq)?;
+    let mut chan = task::block_on(conn.create_channel())?;
 
-    channel
-        .declare_exchange(easyamqp::ExchangeConfig {
-            exchange: "logs".to_owned(),
-            exchange_type: easyamqp::ExchangeType::Topic,
-            passive: false,
-            durable: true,
-            auto_delete: false,
-            no_wait: false,
-            internal: false,
-        })
-        .unwrap();
+    chan.declare_exchange(easyamqp::ExchangeConfig {
+        exchange: "logs".to_owned(),
+        exchange_type: easyamqp::ExchangeType::Topic,
+        passive: false,
+        durable: true,
+        auto_delete: false,
+        no_wait: false,
+        internal: false,
+    })?;
 
     let queue_name = "".to_owned();
-    channel
-        .declare_queue(easyamqp::QueueConfig {
+    chan.declare_queue(easyamqp::QueueConfig {
+        queue: queue_name.clone(),
+        passive: false,
+        durable: false,
+        exclusive: true,
+        auto_delete: true,
+        no_wait: false,
+    })?;
+
+    chan.bind_queue(easyamqp::BindQueueConfig {
+        queue: queue_name.clone(),
+        exchange: "logs".to_owned(),
+        routing_key: Some("*.*".to_owned()),
+        no_wait: false,
+    })?;
+
+    let handle = chan.consume(
+        tasks::log_message_collector::LogMessageCollector::new(
+            PathBuf::from(cfg.log_storage.clone().unwrap().path),
+            100,
+        ),
+        easyamqp::ConsumeConfig {
             queue: queue_name.clone(),
-            passive: false,
-            durable: false,
-            exclusive: true,
-            auto_delete: true,
+            consumer_tag: format!("{}-log-collector", cfg.whoami()),
+            no_local: false,
+            no_ack: false,
             no_wait: false,
-        })
-        .unwrap();
+            exclusive: false,
+        },
+    )?;
 
-    channel
-        .bind_queue(easyamqp::BindQueueConfig {
-            queue: queue_name.clone(),
-            exchange: "logs".to_owned(),
-            routing_key: Some("*.*".to_owned()),
-            no_wait: false,
-        })
-        .unwrap();
+    info!("Fetching jobs from {}", &queue_name);
+    task::block_on(handle);
 
-    let mut channel = channel
-        .consume(
-            worker::new(tasks::log_message_collector::LogMessageCollector::new(
-                PathBuf::from(cfg.log_storage.clone().unwrap().path),
-                100,
-            )),
-            easyamqp::ConsumeConfig {
-                queue: queue_name,
-                consumer_tag: format!("{}-log-collector", cfg.whoami()),
-                no_local: false,
-                no_ack: false,
-                no_wait: false,
-                exclusive: false,
-            },
-        )
-        .unwrap();
-
-    channel.start_consuming();
-
-    info!("Finished consuming?");
-
-    channel.close(200, "Bye").unwrap();
-    info!("Closed the channel");
-    session.close(200, "Good Bye");
+    drop(conn); // Close connection.
     info!("Closed the session... EOF");
+    Ok(())
 }