main runtime in text context or main only

Author: syphar

src/bin/cratesfyi.rs

@@ -1,26 +1,21 @@
-use std::env;
-use std::fmt::Write;
-use std::net::SocketAddr;
-use std::path::PathBuf;
-use std::str::FromStr;
-use std::sync::Arc;
-
 use anyhow::{Context as _, Result, anyhow};
 use clap::{Parser, Subcommand, ValueEnum};
-use docs_rs::db::{self, CrateId, Overrides, add_path_into_database};
-use docs_rs::utils::{
-    ConfigName, get_config, get_crate_pattern_and_priority, list_crate_priorities, queue_builder,
-    remove_crate_priority, set_config, set_crate_priority,
-};
 use docs_rs::{
-    Config, Context, PackageKind, RustwideBuilder, start_background_metrics_webserver,
-    start_web_server,
+    Config, Context, PackageKind, RustwideBuilder,
+    db::{self, CrateId, Overrides, add_path_into_database},
+    start_background_metrics_webserver, start_web_server,
+    utils::{
+        ConfigName, get_config, get_crate_pattern_and_priority, list_crate_priorities,
+        queue_builder, remove_crate_priority, set_config, set_crate_priority,
+    },
 };
 use futures_util::StreamExt;
 use sentry::{
     TransactionContext, integrations::panic as sentry_panic,
     integrations::tracing as sentry_tracing,
 };
+use std::{env, fmt::Write, net::SocketAddr, path::PathBuf, str::FromStr, sync::Arc};
+use tokio::runtime;
 use tracing_log::LogTracer;
 use tracing_subscriber::{EnvFilter, filter::Directive, prelude::*};
 
@@ -183,7 +178,13 @@ enum CommandLine {
 impl CommandLine {
     fn handle_args(self) -> Result<()> {
         let config = Config::from_env()?.build()?;
-        let ctx = Context::from_config(config)?;
+        let runtime = Arc::new(
+            runtime::Builder::new_multi_thread()
+                .enable_all()
+                .build()
+                .expect("failed to initialize runtime"),
+        );
+        let ctx = runtime.block_on(Context::from_config(config))?;
 
         match self {
             Self::Build { subcommand } => subcommand.handle_args(ctx)?,

src/context.rs

@@ -23,23 +23,10 @@ pub struct Context {
     pub registry_api: Arc<RegistryApi>,
     pub repository_stats_updater: Arc<RepositoryStatsUpdater>,
     pub runtime: runtime::Handle,
-    pub owned_runtime: Option<Arc<runtime::Runtime>>,
 }
 
 impl Context {
-    pub fn from_config(config: Config) -> Result<Self> {
-        let runtime = Arc::new(
-            runtime::Builder::new_multi_thread()
-                .enable_all()
-                .build()
-                .expect("failed to initialize runtime"),
-        );
-        let mut ctx = runtime.block_on(Self::from_config_async(config))?;
-        ctx.owned_runtime = Some(runtime);
-        Ok(ctx)
-    }
-
-    pub async fn from_config_async(config: Config) -> Result<Self> {
+    pub async fn from_config(config: Config) -> Result<Self> {
         let config = Arc::new(config);
 
         let instance_metrics = Arc::new(InstanceMetrics::new()?);
@@ -90,7 +77,6 @@ impl Context {
             repository_stats_updater: Arc::new(RepositoryStatsUpdater::new(&config, pool)),
             runtime,
             config,
-            owned_runtime: None,
         })
     }
 }

src/test/mod.rs

@@ -311,6 +311,7 @@ pub(crate) struct TestEnvironment {
     // because the tokio runtime from the context is gone.
     db: TestDatabase,
     pub context: Context,
+    owned_runtime: Option<Arc<runtime::Runtime>>,
 }
 
 pub(crate) fn init_logger() {
@@ -346,7 +347,7 @@ impl TestEnvironment {
                 .expect("failed to initialize runtime"),
         );
         let mut env = runtime.block_on(Self::with_config_async(config));
-        env.context.owned_runtime = Some(runtime);
+        env.owned_runtime = Some(runtime);
         env
     }
 
@@ -422,9 +423,9 @@ impl TestEnvironment {
                     pool.clone(),
                 )),
                 runtime,
-                owned_runtime: None,
             },
             db: test_db,
+            owned_runtime: None,
         }
     }