Merge branch 'main' into beta

buckyos · Apr 15, 2023 · 7ead2f7 · 7ead2f7
2 parents 8e46924 + 314d358
commit 7ead2f7
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 11 deletions.
diff --git a/src/service/app-manager/src/app_cmd_executor.rs b/src/service/app-manager/src/app_cmd_executor.rs
@@ -307,6 +307,7 @@ impl AppCmdExecutor {
             error!("{}", err);
             return Err(BuckyError::from((BuckyErrorCode::InvalidParam, err)));
         }
+
         status.lock().unwrap().set_version(&ver);
 
         self.pre_change_status(
@@ -437,7 +438,7 @@ impl AppCmdExecutor {
         {
             let status = status.lock().unwrap();
             web_id = status.web_dir().cloned();
-            ver = status.version().unwrap().to_owned();
+            ver = status.version().unwrap_or("noversion").to_owned();
         }
 
         let mut target_status_code = AppLocalStatusCode::Uninstalled;

diff --git a/src/service/app-manager/src/app_manager_ex.rs b/src/service/app-manager/src/app_manager_ex.rs
@@ -366,17 +366,21 @@ impl AppManager {
                     AppLocalStatusCode::Installing => {
                         info!("find app {} status {} on startup, try install again", app_id, status_code);
                         let version = status_a.lock().unwrap().version().map(|s|s.to_owned());
-                        match self.cmd_executor.as_ref().unwrap().execute_install(
-                            status_a.clone(),
-                            &AppCmd::install(self.owner.clone(), app_id.clone(), &version.unwrap(), true),
-                            0).await {
-                            Ok(_) => {
-                                None
-                            }
-                            Err(e) => {
-                                error!("install app {} on startup err {}", app_id, e);
-                                Some(AppLocalStatusCode::InstallFailed)
+                        if let Some(version) = version {
+                            match self.cmd_executor.as_ref().unwrap().execute_install(
+                                status_a.clone(),
+                                &AppCmd::install(self.owner.clone(), app_id.clone(), &version, true),
+                                0).await {
+                                Ok(_) => {
+                                    None
+                                }
+                                Err(e) => {
+                                    error!("install app {} on startup err {}", app_id, e);
+                                    Some(AppLocalStatusCode::InstallFailed)
+                                }
                             }
+                        } else {
+                            Some(AppLocalStatusCode::InstallFailed)
                         }
                     },
                     AppLocalStatusCode::Uninstalling => {
@@ -843,6 +847,9 @@ impl AppManager {
                 cmd_code, status_code, next_status_code, app_id, cmd_group_code
             );
             status.set_status(next_status_code);
+            if let CmdCode::Install(install) = cmd_code {
+                status.set_version(&install.ver);
+            }
             status_clone = status.clone();
         }