fix mqtt not starting webserver
This commit is contained in:
@@ -625,7 +625,7 @@ async fn safe_main(spawner: Spawner) -> FatResult<()> {
|
|||||||
|
|
||||||
if stay_alive {
|
if stay_alive {
|
||||||
let reboot_now = Arc::new(AtomicBool::new(false));
|
let reboot_now = Arc::new(AtomicBool::new(false));
|
||||||
let _webserver = http_server(reboot_now.clone(), stack.take().unwrap());
|
spawner.spawn(http_server(reboot_now.clone(), stack.take().unwrap()))?;
|
||||||
wait_infinity(board, WaitType::MqttConfig, reboot_now.clone()).await;
|
wait_infinity(board, WaitType::MqttConfig, reboot_now.clone()).await;
|
||||||
} else {
|
} else {
|
||||||
//TODO wait for all mqtt publishes?
|
//TODO wait for all mqtt publishes?
|
||||||
@@ -907,13 +907,9 @@ async fn try_connect_wifi_sntp_mqtt(
|
|||||||
|
|
||||||
let ip = match stack.config_v4() {
|
let ip = match stack.config_v4() {
|
||||||
Some(config) => config.address.address().to_string(),
|
Some(config) => config.address.address().to_string(),
|
||||||
None => {
|
None => match stack.config_v6() {
|
||||||
match stack.config_v6() {
|
|
||||||
Some(config) => config.address.address().to_string(),
|
Some(config) => config.address.address().to_string(),
|
||||||
None => {
|
None => String::from("No IP"),
|
||||||
String::from("No IP")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
NetworkMode::Wifi {
|
NetworkMode::Wifi {
|
||||||
|
|||||||
Reference in New Issue
Block a user