Factor out taskrun

disk/Cargo.toml

@@ -7,7 +7,6 @@ edition = "2018"
 [dependencies]
 tokio = { version = "1.4.0", features = ["rt-multi-thread", "io-util", "net", "time", "sync", "fs"] }
 tracing = "0.1.25"
-tracing-subscriber = "0.2.17"
 serde_json = "1.0"
 async-channel = "1.6"
 bytes = "1.0.1"
@@ -17,5 +16,6 @@ futures-util = "0.3.13"
 async-stream = "0.3.0"
 hex = "0.4.3"
 err = { path = "../err" }
+taskrun = { path = "../taskrun" }
 netpod = { path = "../netpod" }
 bitshuffle = { path = "../bitshuffle" }

disk/src/agg.rs

@@ -766,7 +766,7 @@ const WEEK: u64 = DAY * 7;
 
 #[test]
 fn agg_x_dim_0() {
-    crate::run(async { agg_x_dim_0_inner().await; Ok(()) }).unwrap();
+    taskrun::run(async { agg_x_dim_0_inner().await; Ok(()) }).unwrap();
 }
 
 async fn agg_x_dim_0_inner() {
@@ -812,7 +812,7 @@ async fn agg_x_dim_0_inner() {
 
 #[test]
 fn agg_x_dim_1() {
-    crate::run(async { agg_x_dim_1_inner().await; Ok(()) }).unwrap();
+    taskrun::run(async { agg_x_dim_1_inner().await; Ok(()) }).unwrap();
 }
 
 async fn agg_x_dim_1_inner() {

disk/src/lib.rs

@@ -929,26 +929,3 @@ impl futures_core::Stream for RawConcatChannelReader {
     }
 
 }
-
-fn run<T, F: std::future::Future<Output=Result<T, Error>>>(f: F) -> Result<T, Error> {
-    tracing_init();
-    tokio::runtime::Builder::new_multi_thread()
-        .worker_threads(12)
-        .max_blocking_threads(256)
-        .enable_all()
-        .build()
-        .unwrap()
-        .block_on(async {
-            f.await
-        })
-}
-
-pub fn tracing_init() {
-    tracing_subscriber::fmt()
-        //.with_timer(tracing_subscriber::fmt::time::uptime())
-        .with_target(true)
-        .with_thread_names(true)
-        //.with_max_level(tracing::Level::INFO)
-        .with_env_filter(tracing_subscriber::EnvFilter::new("info,retrieval=trace,disk=trace,tokio_postgres=info"))
-        .init();
-}