fix rollback

lisong · Sep 8, 2018 · 324d29b · 324d29b
1 parent c9b5653
commit 324d29b
Showing 1 changed file with 33 additions and 21 deletions.
diff --git a/routes/apps.js b/routes/apps.js
@@ -288,7 +288,7 @@ router.post('/:appName/deployments/:deploymentName/release',
       })
       .then((packages) => {
         if (packages) {
-          Promise.delay(2000)
+          Promise.delay(1000)
           .then(() => {
             packageManager.createDiffPackagesByLastNums(deploymentInfo.appid, packages, _.get(config, 'common.diffNums', 1))
             .catch((e) => {
@@ -403,15 +403,6 @@ router.post('/:appName/deployments/:sourceDeploymentName/promote/:destDeployment
       if (!destDeploymentInfo) {
         throw new AppError.AppError(`${destDeploymentName}  does not exist.`);
       }
-      //clear cache if exists.
-      if (_.get(config, 'common.updateCheckCache', false) !== false) {
-        Promise.delay(2500)
-        .then(() => {
-          var ClientManager = require('../core/services/client-manager');
-          var clientManager = new ClientManager();
-          clientManager.clearUpdateCheckCache(destDeploymentInfo.deployment_key, '*', '*', '*');
-        });
-      }
       return [sourceDeploymentInfo, destDeploymentInfo];
     })
     .spread((sourceDeploymentInfo, destDeploymentInfo) => {
@@ -421,14 +412,23 @@ router.post('/:appName/deployments/:sourceDeploymentName/promote/:destDeployment
     })
     .spread((packages, destDeploymentInfo) => {
       if (packages) {
-        Promise.delay(2000)
+        Promise.delay(1000)
         .then(() => {
           packageManager.createDiffPackagesByLastNums(destDeploymentInfo.appid, packages, _.get(config, 'common.diffNums', 1))
           .catch((e) => {
             log.error(e);
           });
         });
       }
+      //clear cache if exists.
+      if (_.get(config, 'common.updateCheckCache', false) !== false) {
+        Promise.delay(2500)
+        .then(() => {
+          var ClientManager = require('../core/services/client-manager');
+          var clientManager = new ClientManager();
+          clientManager.clearUpdateCheckCache(destDeploymentInfo.deployment_key, '*', '*', '*');
+        });
+      }
       return packages;
     })
   })
@@ -456,16 +456,28 @@ var rollbackCb = function (req, res, next) {
     return deployments.findDeloymentByName(deploymentName, col.appid);
   })
   .then((dep) => {
-    //clear cache if exists.
-    if (_.get(config, 'common.updateCheckCache', false) !== false) {
-      Promise.delay(2500)
-      .then(() => {
-        var ClientManager = require('../core/services/client-manager');
-        var clientManager = new ClientManager();
-        clientManager.clearUpdateCheckCache(dep.deployment_key, '*', '*', '*');
-      });
-    }
-    return packageManager.rollbackPackage(dep.last_deployment_version_id, targetLabel, uid);
+    return packageManager.rollbackPackage(dep.last_deployment_version_id, targetLabel, uid)
+    .then((packageInfo)=>{
+      if (packageInfo) {
+        Promise.delay(1000)
+        .then(() => {
+          packageManager.createDiffPackagesByLastNums(dep.appid, packageInfo, 1)
+          .catch((e) => {
+            log.error(e);
+          });
+        });
+      }
+      //clear cache if exists.
+      if (_.get(config, 'common.updateCheckCache', false) !== false) {
+        Promise.delay(2500)
+        .then(() => {
+          var ClientManager = require('../core/services/client-manager');
+          var clientManager = new ClientManager();
+          clientManager.clearUpdateCheckCache(dep.deployment_key, '*', '*', '*');
+        });
+      }
+      return packageInfo;
+    });
   })
   .then(() => {
      res.send('ok');