Start tokio runtime after daemonize

Author: Saruniks

Cargo.toml

@@ -190,6 +190,7 @@ dist-client = [
 ]
 # Enables the sccache-dist binary
 dist-server = [
+  "reqwest/blocking",
   "jwt",
   "flate2",
   "libmount",

src/bin/sccache-dist/main.rs

@@ -26,6 +26,7 @@ use std::path::Path;
 use std::sync::atomic::{AtomicUsize, Ordering};
 use std::sync::{Arc, Mutex, MutexGuard};
 use std::time::{Duration, Instant};
+use tokio::runtime::Runtime;
 
 #[cfg_attr(target_os = "freebsd", path = "build_freebsd.rs")]
 mod build;
@@ -40,8 +41,7 @@ pub const INSECURE_DIST_SERVER_TOKEN: &str = "dangerously_insecure_server";
     all(target_os = "linux", target_arch = "x86_64"),
     target_os = "freebsd"
 ))]
-#[tokio::main]
-async fn main() {
+fn main() {
     init_logging();
 
     let incr_env_strs = ["CARGO_BUILD_INCREMENTAL", "CARGO_INCREMENTAL"];
@@ -69,7 +69,7 @@ async fn main() {
         },
     };
 
-    std::process::exit(match run(command).await {
+    std::process::exit(match run(command) {
         Ok(s) => s,
         Err(e) => {
             eprintln!("sccache-dist: error: {}", e);
@@ -132,7 +132,7 @@ fn check_jwt_server_token(
         .ok()
 }
 
-async fn run(command: Command) -> Result<i32> {
+fn run(command: Command) -> Result<i32> {
     match command {
         Command::Auth(AuthSubcommand::Base64 { num_bytes }) => {
             let mut bytes = vec![0; num_bytes];
@@ -171,7 +171,6 @@ async fn run(command: Command) -> Result<i32> {
                     jwks_url,
                 } => Box::new(
                     token_check::ValidJWTCheck::new(audience, issuer, &jwks_url)
-                        .await
                         .context("Failed to create a checker for valid JWTs")?,
                 ),
                 scheduler_config::ClientAuth::Mozilla { required_groups } => {
@@ -219,7 +218,10 @@ async fn run(command: Command) -> Result<i32> {
                 check_client_auth,
                 check_server_auth,
             );
-            http_scheduler.start().await?;
+
+            // Create runtime after daemonize because Tokio doesn't work well with daemonize
+            let runtime = Runtime::new().context("Failed to create Tokio runtime")?;
+            runtime.block_on(async { http_scheduler.start().await })?;
             unreachable!();
         }
 
@@ -296,7 +298,8 @@ async fn run(command: Command) -> Result<i32> {
                 server,
             )
             .context("Failed to create sccache HTTP server instance")?;
-            http_server.start().await?;
+            let runtime = Runtime::new().context("Failed to create Tokio runtime")?;
+            runtime.block_on(async { http_server.start().await })?;
             unreachable!();
         }
     }

src/bin/sccache-dist/token_check.rs

@@ -339,14 +339,12 @@ impl ClientAuthCheck for ValidJWTCheck {
 }
 
 impl ValidJWTCheck {
-    pub async fn new(audience: String, issuer: String, jwks_url: &str) -> Result<Self> {
-        let res = reqwest::get(jwks_url)
-            .await
-            .context("Failed to make request to JWKs url")?;
+    pub fn new(audience: String, issuer: String, jwks_url: &str) -> Result<Self> {
+        let res = reqwest::blocking::get(jwks_url).context("Failed to make request to JWKs url")?;
         if !res.status().is_success() {
             bail!("Could not retrieve JWKs, HTTP error: {}", res.status())
         }
-        let jwks: Jwks = res.json().await.context("Failed to parse JWKs json")?;
+        let jwks: Jwks = res.json().context("Failed to parse JWKs json")?;
         let kid_to_pkcs1 = jwks
             .keys
             .into_iter()