fix: Properly report error happened in pipeline

getdozer · Nov 20, 2023 · 9717fc8 · 9717fc8
1 parent e98901f
commit 9717fc8
Show file tree

Hide file tree

Showing 4 changed files with 168 additions and 175 deletions.
diff --git a/dozer-cli/src/live/state.rs b/dozer-cli/src/live/state.rs
@@ -365,16 +365,13 @@ fn run(
     shutdown_receiver: ShutdownReceiver,
     temp_dir: &str,
 ) -> Result<JoinHandle<()>, OrchestrationError> {
-    let mut dozer = get_dozer_run_instance(dozer, labels, request, temp_dir)?;
+    let dozer = get_dozer_run_instance(dozer, labels, request, temp_dir)?;
 
     validate_config(&dozer.config)?;
     let runtime = dozer.runtime.clone();
-    let run_thread = std::thread::spawn(move || dozer.run_all(shutdown_receiver, false));
 
     let handle = std::thread::spawn(move || {
-        runtime.block_on(async {
-            run_thread.join().unwrap().unwrap();
-        });
+        runtime.block_on(async move { dozer.run_all(shutdown_receiver, false).await.unwrap() });
     });
 
     Ok(handle)

diff --git a/dozer-cli/src/main.rs b/dozer-cli/src/main.rs
@@ -160,7 +160,7 @@ fn run() -> Result<(), OrchestrationError> {
     }
     let config = config_res?;
 
-    let mut dozer = init_dozer(
+    let dozer = init_dozer(
         runtime.clone(),
         config.clone(),
         LabelsAndProgress::new(Default::default(), cli.enable_progress),
@@ -172,19 +172,23 @@ fn run() -> Result<(), OrchestrationError> {
         Commands::Run(run) => match run.command {
             Some(RunCommands::Api) => {
                 render_logo();
-                dozer.run_api(shutdown_receiver)
+                dozer.runtime.block_on(dozer.run_api(shutdown_receiver))
             }
             Some(RunCommands::App) => {
                 render_logo();
-                dozer.run_apps(shutdown_receiver, None)
+                dozer
+                    .runtime
+                    .block_on(dozer.run_apps(shutdown_receiver, None))
             }
             Some(RunCommands::Lambda) => {
                 render_logo();
                 dozer.runtime.block_on(dozer.run_lambda(shutdown_receiver))
             }
             None => {
                 render_logo();
-                dozer.run_all(shutdown_receiver, run.locked)
+                dozer
+                    .runtime
+                    .block_on(dozer.run_all(shutdown_receiver, run.locked))
             }
         },
         Commands::Security(security) => match security.command {
@@ -197,7 +201,9 @@ fn run() -> Result<(), OrchestrationError> {
         Commands::Build(build) => {
             let force = build.force.is_some();
 
-            dozer.build(force, shutdown_receiver, build.locked)
+            dozer
+                .runtime
+                .block_on(dozer.build(force, shutdown_receiver, build.locked))
         }
         Commands::Connectors(ConnectorCommand { filter }) => dozer.runtime.block_on(async {
             let (abort_handle, registration) = AbortHandle::new_pair();