add a typed wrapper to amqp to avoid false, false, false, false

ofborg/src/bin/builder.rs

@@ -9,13 +9,12 @@ use std::env;
 
 use std::path::Path;
 use amqp::Basic;
-use amqp::Session;
-use amqp::Table;
-
 use ofborg::config;
 use ofborg::checkout;
 use ofborg::notifyworker;
 use ofborg::tasks;
+use ofborg::easyamqp;
+use ofborg::easyamqp::TypedWrappers;
 
 
 fn main() {
@@ -23,36 +22,29 @@ fn main() {
 
     ofborg::setup_log();
 
-    println!("Hello, world!");
-
-
-    let mut session = Session::open_url(&cfg.rabbitmq.as_uri()).unwrap();
-    println!("Connected to rabbitmq");
-
-    let mut channel = session.open_channel(1).unwrap();
-
     let cloner = checkout::cached_cloner(Path::new(&cfg.checkout.root));
     let nix = cfg.nix();
 
-
-
-    let full_logs: bool;
-    match &cfg.feedback {
+    let full_logs: bool = match &cfg.feedback {
         &Some(ref feedback) => {
-            full_logs = feedback.full_logs;
+            feedback.full_logs
         }
         &None => {
             warn!("Please define feedback.full_logs in your configuration to true or false!");
             warn!("feedback.full_logs when true will cause the full build log to be sent back");
             warn!("to the server, and be viewable by everyone.");
             warn!("I strongly encourage everybody turn this on!");
-            full_logs = false;
+            false
         }
-    }
+    };
 
+
+    let mut session = easyamqp::session_from_config(&cfg.rabbitmq).unwrap();
+    let mut channel = session.open_channel(1).unwrap();
     channel.basic_prefetch(1).unwrap();
+
     channel
-        .basic_consume(
+        .consume(
             notifyworker::new(tasks::build::BuildWorker::new(
                 cloner,
                 nix,
@@ -60,20 +52,19 @@ fn main() {
                 cfg.runner.identity.clone(),
                 full_logs,
             )),
-            format!("build-inputs-{}", cfg.nix.system.clone()).as_ref(),
-            format!("{}-builder", cfg.whoami()).as_ref(),
-            false,
-            false,
-            false,
-            false,
-            Table::new(),
+            easyamqp::ConsumeConfig {
+                queue: format!("build-inputs-{}", cfg.nix.system.clone()),
+                consumer_tag: format!("{}-builder", cfg.whoami()),
+                no_local: false,
+                no_ack: false,
+                exclusive: false,
+                nowait: false,
+                arguments: None
+            },
         )
         .unwrap();
 
     channel.start_consuming();
-
-    println!("Finished consuming?");
-
     channel.close(200, "Bye").unwrap();
     println!("Closed the channel");
     session.close(200, "Good Bye");

ofborg/src/config.rs

@@ -27,7 +27,7 @@ pub struct FeedbackConfig {
     pub full_logs: bool,
 }
 
-#[derive(Serialize, Deserialize, Debug)]
+#[derive(Serialize, Deserialize, Debug, Clone)]
 pub struct RabbitMQConfig {
     pub ssl: bool,
     pub host: String,
@@ -107,7 +107,6 @@ impl Config {
     }
 }
 
-
 impl RabbitMQConfig {
     pub fn as_uri(&self) -> String {
         return format!(

ofborg/src/easyamqp.rs

@@ -0,0 +1,66 @@
+
+use ofborg;
+use ofborg::config::RabbitMQConfig;
+use amqp;
+use amqp::Basic;
+
+pub struct ConsumeConfig {
+    pub queue: String,
+    pub consumer_tag: String,
+    pub no_local: bool,
+    pub no_ack: bool,
+    pub exclusive: bool,
+    pub nowait: bool,
+    pub arguments: Option<amqp::Table>,
+}
+
+pub fn session_from_config(config: &RabbitMQConfig)
+                           -> Result<amqp::Session, amqp::AMQPError> {
+    let scheme = if config.ssl {
+        amqp::AMQPScheme::AMQPS
+    } else {
+        amqp::AMQPScheme::AMQP
+    };
+
+    let mut properties = amqp::Table::new();
+    //  properties.insert("identity".to_owned(), amqp::TableEntry::LongString(identity.to_owned()));
+    properties.insert(
+        "ofborg_version".to_owned(),
+        amqp::TableEntry::LongString(ofborg::VERSION.to_owned())
+    );
+
+    amqp::Session::new(
+        amqp::Options{
+            host: config.host.clone(),
+            login: config.username.clone(),
+            password: config.password.clone(),
+            scheme: scheme,
+            properties: properties,
+            .. amqp::Options::default()
+        }
+    )
+}
+
+pub trait TypedWrappers {
+    fn consume<T>(&mut self, callback: T, config: ConsumeConfig)
+                  -> Result<String, amqp::AMQPError>
+        where T: amqp::Consumer + 'static;
+}
+
+impl TypedWrappers for amqp::Channel {
+    fn consume<T>(&mut self, callback: T, config: ConsumeConfig)
+                  -> Result<String, amqp::AMQPError>
+        where T: amqp::Consumer + 'static
+    {
+        self.basic_consume(
+            callback,
+            config.queue,
+            config.consumer_tag,
+            config.no_local,
+            config.no_ack,
+            config.exclusive,
+            config.nowait,
+            config.arguments.unwrap_or(amqp::Table::new()),
+        )
+    }
+}

ofborg/src/lib.rs

@@ -40,6 +40,7 @@ pub mod asynccmd;
 pub mod notifyworker;
 pub mod writetoline;
 pub mod test_scratch;
+pub mod easyamqp;
 
 pub mod ofborg {
     pub use asynccmd;
@@ -62,8 +63,9 @@ pub mod ofborg {
     pub use tagger;
     pub use writetoline;
     pub use test_scratch;
+    pub use easyamqp;
 
-
+    pub const VERSION: &'static str = env!("CARGO_PKG_VERSION");
 }
 
 pub fn setup_log() {