swaits/dioxus
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #105 from Demonthos/hot-reloading-resilient

Browse Source 
Log io errors instead of panicking for hot reloading
This commit is contained in:
Jon Kelley authored and GitHub committed 2023-02-22 11:50:39 -08:00
2 parents 39b80129f9 bfbda510fe
commit 6c2a51e453
1 file changed
+16 -11
Download Patch File Download Diff File Expand all files Collapse all files
src/server/mod.rs
+16 -11
View File
@@ -136,9 +136,11 @@ pub async fn startup_hot_reload(ip: String, port: u16, config: CrateConfig) -> R
let dist_path = config.out_dir.clone(); let dist_path = config.out_dir.clone();
let (reload_tx, _) = broadcast::channel(100); let (reload_tx, _) = broadcast::channel(100);
let file_map = Arc::new(Mutex::new(FileMap::<HtmlCtx>::new( let FileMapBuildResult { map, errors } = FileMap::<HtmlCtx>::create(config.crate_dir.clone())?;
config.crate_dir.clone(), for err in errors {
))); log::error!("{}", err);
}
let file_map = Arc::new(Mutex::new(map));
let build_manager = Arc::new(BuildManager { let build_manager = Arc::new(BuildManager {
config: config.clone(), config: config.clone(),
reload_tx: reload_tx.clone(), reload_tx: reload_tx.clone(),
@@ -185,10 +187,10 @@ pub async fn startup_hot_reload(ip: String, port: u16, config: CrateConfig) -> R
let mut map = file_map.lock().unwrap(); let mut map = file_map.lock().unwrap();
match map.update_rsx(&path, &crate_dir) { match map.update_rsx(&path, &crate_dir) {
UpdateResult::UpdatedRsx(msgs) => { Ok(UpdateResult::UpdatedRsx(msgs)) => {
messages.extend(msgs); messages.extend(msgs);
} }
UpdateResult::NeedsRebuild => { Ok(UpdateResult::NeedsRebuild) => {
match build_manager.rebuild() { match build_manager.rebuild() {
Ok(res) => { Ok(res) => {
print_console_info( print_console_info(
@@ -208,6 +210,9 @@ pub async fn startup_hot_reload(ip: String, port: u16, config: CrateConfig) -> R
} }
return; return;
} }
Err(err) => {
log::error!("{}", err);
}
} }
} }
for msg in messages { for msg in messages {
@@ -222,12 +227,12 @@ pub async fn startup_hot_reload(ip: String, port: u16, config: CrateConfig) -> R
.unwrap(); .unwrap();
for sub_path in allow_watch_path { for sub_path in allow_watch_path {
watcher if let Err(err) = watcher.watch(
.watch( &config.crate_dir.join(&sub_path),
&config.crate_dir.join(sub_path), notify::RecursiveMode::Recursive,
notify::RecursiveMode::Recursive, ) {
) log::error!("error watching {sub_path:?}: \n{}", err);
.unwrap(); }
} }
// start serve dev-server at 0.0.0.0:8080 // start serve dev-server at 0.0.0.0:8080