refactor(DeployJob): launch pelias job for both new and existing serv…

…er instances
realCity · Sep 30, 2021 · 6039987 · 6039987
1 parent 46c9524
commit 6039987
Showing 1 changed file with 9 additions and 12 deletions.
diff --git a/src/main/java/com/conveyal/datatools/manager/jobs/DeployJob.java b/src/main/java/com/conveyal/datatools/manager/jobs/DeployJob.java
@@ -316,25 +316,13 @@ public void jobLogic () {
                     status.fail(String.format("Error uploading/copying deployment bundle to s3://%s", s3Bucket), e);
                 }
             }
-
-            // Now that the build was successful, update Pelias
-            if (deployment.peliasUpdate) {
-                // Get log upload URI from deploy job
-                AmazonS3URI logUploadS3URI = getS3FolderURI();
-
-                // Execute the pelias update job and keep track of it
-                PeliasUpdateJob peliasUpdateJob = new PeliasUpdateJob(owner, "Updating Custom Geocoder Database", deployment, logUploadS3URI);
-                addNextJob(peliasUpdateJob);
-            }
         }
 
         // Handle spinning up new EC2 servers for the load balancer's target group.
         if (otpServer.ec2Info != null) {
             if ("true".equals(DataManager.getConfigPropertyAsText("modules.deployment.ec2.enabled"))) {
                 replaceEC2Servers();
                 tasksCompleted++;
-                // If creating a new server, there is no need to deploy to an existing one.
-                return;
             } else {
                 status.fail("Cannot complete deployment. EC2 deployment disabled in server configuration.");
                 return;
@@ -350,6 +338,15 @@ public void jobLogic () {
             status.baseUrl = otpServer.publicUrl;
         }
 
+        // Now that the build + deployment was successful, update Pelias
+        if (deployment.peliasUpdate) {
+            // Get log upload URI from deploy job
+            AmazonS3URI logUploadS3URI = getS3FolderURI();
+
+            // Execute the pelias update job and keep track of it
+            PeliasUpdateJob peliasUpdateJob = new PeliasUpdateJob(owner, "Updating Custom Geocoder Database", deployment, logUploadS3URI);
+            addNextJob(peliasUpdateJob);
+        }
 
         status.completed = true;
     }