Migrate the rest to the new config

ofborg/src/bin/build-faker.rs

@@ -18,7 +18,7 @@ fn main() -> Result<(), Box<dyn Error>> {
     let arg = env::args().nth(1).expect("usage: build-faker <config>");
     let cfg = config::load(arg.as_ref());
 
-    let conn = easylapin::from_config(&cfg.rabbitmq)?;
+    let conn = easylapin::from_config(&cfg.builder.unwrap().rabbitmq)?;
     let mut chan = task::block_on(conn.create_channel())?;
 
     let repo_msg = Repo {

ofborg/src/bin/stats.rs

@@ -4,18 +4,26 @@ use std::thread;
 
 use async_std::task;
 use hyper::server::{Request, Response, Server};
-use tracing::info;
+use tracing::{error, info};
 
 use ofborg::easyamqp::{ChannelExt, ConsumerExt};
 use ofborg::{config, easyamqp, easylapin, stats, tasks};
 
 fn main() -> Result<(), Box<dyn Error>> {
     ofborg::setup_log();
 
-    let arg = env::args().nth(1).expect("usage: stats <config>");
+    let arg = env::args()
+        .nth(1)
+        .unwrap_or_else(|| panic!("usage: {} <config>", std::env::args().next().unwrap()));
     let cfg = config::load(arg.as_ref());
 
-    let conn = easylapin::from_config(&cfg.rabbitmq)?;
+    let Some(stats_cfg) = config::load(arg.as_ref()).stats else {
+        error!("No stats configuration found!");
+        panic!();
+    };
+
+    let conn = easylapin::from_config(&stats_cfg.rabbitmq)?;
+
     let mut chan = task::block_on(conn.create_channel())?;
 
     let events = stats::RabbitMq::from_lapin(&cfg.whoami(), task::block_on(conn.create_channel())?);

ofborg/src/config.rs

@@ -31,10 +31,11 @@ pub struct Config {
     pub builder: Option<Builder>,
     /// Configuration for the log message collector
     pub log_message_collector: Option<LogMessageCollector>,
+    /// Configuration for the stats server
+    pub stats: Option<Stats>,
     pub runner: RunnerConfig,
     pub checkout: CheckoutConfig,
     pub nix: NixConfig,
-    pub rabbitmq: RabbitMqConfig,
     pub github_app: Option<GithubAppConfig>,
 }
 
@@ -120,8 +121,17 @@ pub struct LogMessageCollector {
     pub logs_path: String,
 }
 
+/// Configuration for the stats exporter
+#[derive(Serialize, Deserialize, Debug)]
+#[serde(deny_unknown_fields)]
+pub struct Stats {
+    /// RabbitMQ broker to connect to
+    pub rabbitmq: RabbitMqConfig,
+}
+
 /// Configures the connection to a RabbitMQ instance
 #[derive(Serialize, Deserialize, Debug, Clone)]
+#[serde(deny_unknown_fields)]
 pub struct RabbitMqConfig {
     /// Whether or not to use SSL
     pub ssl: bool,