ログをもうちょい細かくする

Author: melpon

feline/src/jail.rs

@@ -402,7 +402,11 @@ pub async fn prepare_environment(
         .output()
         .await?;
     if !uid.status.success() {
-        return Err(anyhow::anyhow!("Failed to get uid"));
+        return Err(anyhow::anyhow!(
+            "Failed to get uid: status={}, base_dir={}",
+            &uid.status,
+            base_dir.to_str().unwrap_or(""),
+        ));
     }
     let uid: String = String::from_utf8(uid.stdout)?.trim().to_string();
     let gid: Output = Command::new("podman")
@@ -415,7 +419,11 @@ pub async fn prepare_environment(
         .output()
         .await?;
     if !gid.status.success() {
-        return Err(anyhow::anyhow!("Failed to get gid"));
+        return Err(anyhow::anyhow!(
+            "Failed to get gid: status={}, base_dir={}",
+            &gid.status,
+            base_dir.to_str().unwrap_or(""),
+        ));
     }
     let gid: String = String::from_utf8(gid.stdout)?.trim().to_string();
     let r: Output = Command::new("podman")
@@ -427,7 +435,11 @@ pub async fn prepare_environment(
         .output()
         .await?;
     if !r.status.success() {
-        return Err(anyhow::anyhow!("Failed to unshare"));
+        return Err(anyhow::anyhow!(
+            "Failed to unshare: status={}, base_dir={}",
+            &r.status,
+            base_dir.to_str().unwrap_or(""),
+        ));
     }
     Ok(base_dir)
 }

feline/src/main.rs

@@ -62,7 +62,7 @@ struct Args {
 
 #[tokio::main]
 async fn main() {
-    env_logger::init();
+    env_logger::builder().format_source_path(true).init();
 
     let args: Args = Args::parse();
     let config: Config =
@@ -160,7 +160,10 @@ mod tests {
 
     #[tokio::test]
     async fn test_logging_middleware() {
-        let _ = env_logger::builder().is_test(true).try_init();
+        let _ = env_logger::builder()
+            .is_test(true)
+            .format_source_path(true)
+            .try_init();
 
         let app: Router = Router::new()
             .route("/ok", get(ok_handler))