Check separately for machine not being removed from repository

Author: Graeme Foster

AzureWebFarm.OctopusDeploy/Infrastructure/OctopusDeploy.cs

@@ -53,26 +53,29 @@ private void HandleFailedRemoval()
             {
                 try
                 {
-                    Log.Information("Detected existing tentacle.config - possible abrupt restart. Deleting tentacle.config.");
+                    Log.Information(
+                        "Detected existing tentacle.config - possible abrupt restart. Deleting tentacle.config.");
                     File.Delete(Path.Combine(_tentacleInstallPath, "Tentacle.config"));
                     Log.Information("Successfully removed tentacle.config from role.");
                 }
                 catch (Exception e)
                 {
                     Log.Error(e, "Failed to remove certificate from Octopus server. Manual intevention required.");
                 }
+            }
 
+            if (_repository.Machines.FindByName(_machineName) != null)
+            {
                 try
                 {
-                    Log.Information("Attempting to remove tentacle from Octopus server.");
+                    Log.Information("Detected existing machine using this name. Attempting to remove tentacle from Octopus server.");
                     DeleteMachine();
                     Log.Information("Successfully removed tentacle from Octopus server.");
                 }
                 catch (Exception e)
                 {
                     Log.Error(e, "Failed to remove tentacle from Octopus server. Manual intevention required.");
                 }
-
             }
         }
 
@@ -100,7 +103,7 @@ public void DeployAllCurrentReleasesToThisMachine()
                             Comments = "Automated startup deployment by " + _machineName,
                             EnvironmentId = currentRelease.EnvironmentId,
                             ReleaseId = currentRelease.ReleaseId,
-                            SpecificMachineIds = new ReferenceCollection(new[] {machineId})
+                            SpecificMachineIds = new ReferenceCollection(new[] { machineId })
                         }
                     ))
                     .Select(d => d.TaskId)