v0.3.5

src/main.rs

@@ -25,7 +25,12 @@ async fn main() -> Result<()> {
     init_tracing();
 
     let db = Db::open(&config.database)?;
-    let runtime_settings = db.load_runtime_settings()?.unwrap_or_else(|| config.runtime_defaults());
+    let mut runtime_settings = db.load_runtime_settings()?.unwrap_or_else(|| config.runtime_defaults());
+    // Network deployment settings explicitly provided by the service environment are authoritative.
+    // This makes /etc/gree-controller.env useful even after runtime settings were persisted in SQLite.
+    if std::env::var_os("GREE_CONTROLLER_DISCOVERY_BROADCAST").is_some() {
+        runtime_settings.discovery_broadcast = config.discovery_broadcast.clone();
+    }
     db.save_runtime_settings(&runtime_settings)?;
 
     if config.simulate && config.auto_seed && db.count_devices()? == 0 {
@@ -47,7 +52,10 @@ async fn main() -> Result<()> {
         db,
         settings: Arc::new(RwLock::new(runtime_settings.clone())),
         config: Arc::new(config.clone()),
-        gree: GreeClient::new(runtime_settings.controller_id.clone()),
+        gree: GreeClient::new(
+            runtime_settings.controller_id.clone(),
+            (!config.gree_interface.trim().is_empty()).then(|| config.gree_interface.trim().to_string()),
+        ),
         events,
         http,
         started: Instant::now(),
@@ -58,11 +66,14 @@ async fn main() -> Result<()> {
     let listener = TcpListener::bind(config.bind).await
         .with_context(|| format!("cannot bind HTTP server to {}", config.bind))?;
 
+    let gree_interface_log = if config.gree_interface.trim().is_empty() { "auto" } else { config.gree_interface.trim() };
     tracing::info!(
         address = %config.bind,
         database = %config.database.display(),
         simulator = config.simulate,
         auth = !config.app_token.trim().is_empty(),
+        gree_interface = %gree_interface_log,
+        discovery_broadcast = %runtime_settings.discovery_broadcast,
         "GREE Controller started"
     );