Merge pull request #37 from niwaniwa/niwaniwa/feature/mqtt-address

Niwaniwa/feature/mqtt address

Author: niwaniwa

docker-compose.yml

@@ -32,6 +32,7 @@ services:
       - 8080:8080
     environment:
       DATABASE_URL: postgres://sakura:password@db:5432/sakura
+      MQTT_URL: mqtt://mqtt:1883
     networks:
       - sakura-internal
       - sakura-external

src/infrastructures/mqtt_connection.rs

@@ -1,11 +1,11 @@
+use std::collections::HashMap;
+use std::env;
+
 use crate::domain::repository::mqtt::client::MqttClientRepository;
 use crate::infrastructures::config::mqtt_config::MqttConfig;
 use crate::infrastructures::iot::mqtt_client::MqttClient;
 use crate::server::connection::RequestContext;
 
-use std::collections::HashMap;
-use std::env;
-
 pub struct MqttConnection {
     cfg: MqttConfig,
 }
@@ -16,9 +16,10 @@ impl MqttConnection {
     }
 
     pub fn mqtt_client_repository(&self) -> impl MqttClientRepository {
+        let address = env::var("MQTT_URL").expect("MQTT_URL is not set");
         let host = env::args()
             .nth(1)
-            .unwrap_or_else(|| "mqtt://".to_string() + &self.cfg.address);
+            .unwrap_or_else(|| "mqtt://".to_string() + &address);
 
         let create_opts = paho_mqtt::CreateOptionsBuilder::new()
             .server_uri(host)

src/server/connection.rs

@@ -20,7 +20,7 @@ pub struct RequestContext {
 impl RequestContext {
     pub fn new() -> RequestContext {
         dotenv().ok();
-        let db_url = env::var("DATABASE_URL").expect("DATABASE_URL i not set");
+        let db_url = env::var("DATABASE_URL").expect("DATABASE_URL is not set");
         let manager = ConnectionManager::<PgConnection>::new(db_url);
         let pool = Pool::builder()
             .build(manager)