Spawn init_metrics on CORE to run on tokio runtime and avoid panic.

KomodoPlatform · Dec 12, 2020 · f66fcc0 · f66fcc0
1 parent 0eb3342
commit f66fcc0
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/mm2src/lp_native_dex.rs b/mm2src/lp_native_dex.rs
@@ -537,7 +537,12 @@ pub async fn lp_init(mypubport: u16, ctx: MmArc) -> Result<(), String> {
     let ctx_id = try_s!(ctx.ffi_handle());
 
     spawn_rpc(ctx_id);
-
+    let ctxʹ = ctx.clone();
+    spawn(async move {
+        if let Err(err) = ctxʹ.init_metrics() {
+            log!("Warning: couldn't initialize metrics system: "(err));
+        }
+    });
     // In the mobile version we might depend on `lp_init` staying around until the context stops.
     loop {
         if ctx.is_stopping() {

diff --git a/mm2src/mm2.rs b/mm2src/mm2.rs
@@ -79,9 +79,6 @@ pub fn lp_main(conf: Json, ctx_cb: &dyn Fn(u32)) -> Result<(), String> {
         let netid = conf["netid"].as_u64().unwrap_or(0) as u16;
         let (_, pubport, _) = try_s!(lp_ports(netid));
         let ctx = MmCtxBuilder::new().with_conf(conf).into_mm_arc();
-        if let Err(err) = ctx.init_metrics() {
-            log!("Warning: couldn't initialize metricx system: "(err));
-        }
         ctx_cb(try_s!(ctx.ffi_handle()));
         try_s!(block_on(lp_init(pubport, ctx)));
         Ok(())