Skip to content

Commit

Permalink
Fix merge issues (#209)
Browse files Browse the repository at this point in the history
XdoctorwhoZ authored Dec 29, 2024
1 parent eae507c commit 3f63a57
Showing 1 changed file with 1 addition and 22 deletions.
23 changes: 1 addition & 22 deletions src/platform.rs
Original file line number Diff line number Diff line change
@@ -58,7 +58,7 @@ pub struct Platform {
///
///
config: crate::config::Config,

///
/// Flag to know if we the platform must continue its work
keep_alive: Arc<AtomicBool>,
@@ -229,9 +229,6 @@ impl Platform {
// Manage service requests
let request_value = request.unwrap();
match request_value {
ServiceRequest::ReadConfig => {
self.service_read_config().await;
},
ServiceRequest::Boot => {
self.service_boot().await;
},
@@ -410,7 +407,6 @@ impl Platform {
log_info!(self.logger, "----- SERVICE : READ CONFIG -----");

self.config = crate::config::get_platform_config(self.logger.clone());

}

/// -------------------------------------------------------------
@@ -436,23 +432,6 @@ impl Platform {

let listen_addr = format!("{}:{}", addr, port);

let addr = self
.config
.broker
.as_ref()
.and_then(|b| b.addr.clone())
.unwrap_or("127.0.0.1".to_string());

let port = self
.config
.broker
.as_ref()
.and_then(|b| b.port.clone())
.unwrap_or(1883);

let listen_addr = format!("{}:{}", addr, port);


let mut router: std::collections::HashMap<String, config::Value> = config::Map::new();
router.insert("id".to_string(), config::Value::new(None, 0));
router.insert(

0 comments on commit 3f63a57

Please sign in to comment.