Skip to content

Commit 70367c2

Browse files
robdmoorerobdmoore
committed
Merge pull request #34 from graemefoster/forceful-tentacle-destruction
Forceful tentacle destruction
2 parents 63030a5 + c2a8e81 commit 70367c2

File tree

7 files changed

+47
-11
lines changed

7 files changed

+47
-11
lines changed

‎AzureWebFarm.OctopusDeploy.Tests/AzureWebFarm.OctopusDeploy.Tests.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,8 @@
6060
<SpecificVersion>False</SpecificVersion>
6161
<HintPath>..\packages\NSubstitute.1.7.2.0\lib\NET45\NSubstitute.dll</HintPath>
6262
</Reference>
63-
<Reference Include="Octopus.Client, Version=3.2.0.0, Culture=neutral, processorArchitecture=MSIL">
64-
<HintPath>..\packages\Octopus.Client.3.2.0\lib\net40\Octopus.Client.dll</HintPath>
63+
<Reference Include="Octopus.Client, Version=3.2.1.0, Culture=neutral, processorArchitecture=MSIL">
64+
<HintPath>..\packages\Octopus.Client.3.2.1\lib\net40\Octopus.Client.dll</HintPath>
6565
<Private>True</Private>
6666
</Reference>
6767
<Reference Include="Shouldly">

‎AzureWebFarm.OctopusDeploy.Tests/packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<package id="Microsoft.Web.Xdt" version="1.0.0" targetFramework="net45" />
88
<package id="Newtonsoft.Json" version="7.0.1" targetFramework="net45" />
99
<package id="NSubstitute" version="1.7.2.0" targetFramework="net45" />
10-
<package id="Octopus.Client" version="3.2.0" targetFramework="net45" />
10+
<package id="Octopus.Client" version="3.2.1" targetFramework="net45" />
1111
<package id="Shouldly" version="1.1.1.1" targetFramework="net45" />
1212
<package id="xunit" version="1.9.2" targetFramework="net45" />
1313
<package id="xunit.extensions" version="1.9.2" targetFramework="net45" />

‎AzureWebFarm.OctopusDeploy/AzureWebFarm.OctopusDeploy.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,8 @@
5959
<HintPath>..\packages\Newtonsoft.Json.7.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
6060
<Private>True</Private>
6161
</Reference>
62-
<Reference Include="Octopus.Client, Version=3.2.0.0, Culture=neutral, processorArchitecture=MSIL">
63-
<HintPath>..\packages\Octopus.Client.3.2.0\lib\net40\Octopus.Client.dll</HintPath>
62+
<Reference Include="Octopus.Client, Version=3.2.1.0, Culture=neutral, processorArchitecture=MSIL">
63+
<HintPath>..\packages\Octopus.Client.3.2.1\lib\net40\Octopus.Client.dll</HintPath>
6464
<Private>True</Private>
6565
</Reference>
6666
<Reference Include="Serilog, Version=1.2.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">

‎AzureWebFarm.OctopusDeploy/Infrastructure/OctopusDeploy.cs‎

Lines changed: 35 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,8 @@ public void ConfigureTentacle()
3737
{
3838
var tentacleDeploymentsPath = _config.TentacleDeploymentsPath;
3939

40+
HandleFailedRemoval();
41+
4042
_processRunner.Run(_tentaclePath, string.Format("create-instance {0} --config \"{1}\" --console", InstanceArg, Path.Combine(_tentacleInstallPath, "Tentacle.config")));
4143
_processRunner.Run(_tentaclePath, string.Format("new-certificate {0} --console", InstanceArg));
4244
_processRunner.Run(_tentaclePath, string.Format("configure {0} --home \"{1}\" --console", InstanceArg, tentacleDeploymentsPath.Substring(0, tentacleDeploymentsPath.Length - 1)));
@@ -45,6 +47,38 @@ public void ConfigureTentacle()
4547
_processRunner.Run(_tentaclePath, string.Format("service {0} --install --start --console", InstanceArg));
4648
}
4749

50+
private void HandleFailedRemoval()
51+
{
52+
if (File.Exists(Path.Combine(_tentacleInstallPath, "Tentacle.config")))
53+
{
54+
try
55+
{
56+
Log.Information(
57+
"Detected existing tentacle.config - possible abrupt restart. Deleting tentacle.config.");
58+
File.Delete(Path.Combine(_tentacleInstallPath, "Tentacle.config"));
59+
Log.Information("Successfully removed tentacle.config from role.");
60+
}
61+
catch (Exception e)
62+
{
63+
Log.Error(e, "Failed to remove certificate from Octopus server. Manual intevention required.");
64+
}
65+
}
66+
67+
if (_repository.Machines.FindByName(_machineName) != null)
68+
{
69+
try
70+
{
71+
Log.Information("Detected existing machine using this name. Attempting to remove tentacle from Octopus server.");
72+
DeleteMachine();
73+
Log.Information("Successfully removed tentacle from Octopus server.");
74+
}
75+
catch (Exception e)
76+
{
77+
Log.Error(e, "Failed to remove tentacle from Octopus server. Manual intevention required.");
78+
}
79+
}
80+
}
81+
4882
public void DeleteMachine()
4983
{
5084
var machine = _repository.Machines.FindByName(_machineName);
@@ -69,7 +103,7 @@ public void DeployAllCurrentReleasesToThisMachine()
69103
Comments = "Automated startup deployment by " + _machineName,
70104
EnvironmentId = currentRelease.EnvironmentId,
71105
ReleaseId = currentRelease.ReleaseId,
72-
SpecificMachineIds = new ReferenceCollection(new[] {machineId})
106+
SpecificMachineIds = new ReferenceCollection(new[] { machineId })
73107
}
74108
))
75109
.Select(d => d.TaskId)

‎AzureWebFarm.OctopusDeploy/packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<package id="Microsoft.Web.Administration" version="7.0.0.0" targetFramework="net45" />
66
<package id="Microsoft.WindowsAzure.ConfigurationManager" version="2.0.3" targetFramework="net45" />
77
<package id="Newtonsoft.Json" version="7.0.1" targetFramework="net45" />
8-
<package id="Octopus.Client" version="3.2.0" targetFramework="net45" />
8+
<package id="Octopus.Client" version="3.2.1" targetFramework="net45" />
99
<package id="Serilog" version="1.2.25" targetFramework="net45" />
1010
<package id="Serilog.Sinks.AzureTableStorage" version="1.2.25" targetFramework="net45" />
1111
<package id="System.Spatial" version="5.2.0" targetFramework="net45" />

‎ExampleWebFarm/ExampleWebFarm.csproj‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,8 @@
7070
<HintPath>..\packages\Newtonsoft.Json.7.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
7171
<Private>True</Private>
7272
</Reference>
73-
<Reference Include="Octopus.Client, Version=3.2.0.0, Culture=neutral, processorArchitecture=MSIL">
74-
<HintPath>..\packages\Octopus.Client.3.2.0\lib\net40\Octopus.Client.dll</HintPath>
73+
<Reference Include="Octopus.Client, Version=3.2.1.0, Culture=neutral, processorArchitecture=MSIL">
74+
<HintPath>..\packages\Octopus.Client.3.2.1\lib\net40\Octopus.Client.dll</HintPath>
7575
<Private>True</Private>
7676
</Reference>
7777
<Reference Include="Serilog, Version=1.2.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
@@ -106,7 +106,9 @@
106106
<ItemGroup>
107107
<Content Include="Default.aspx" />
108108
<Content Include="Global.asax" />
109-
<Content Include="Web.config" />
109+
<Content Include="Web.config">
110+
<SubType>Designer</SubType>
111+
</Content>
110112
</ItemGroup>
111113
<ItemGroup>
112114
<Content Include="packages.config">

‎ExampleWebFarm/packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<package id="Microsoft.Web.Administration" version="7.0.0.0" targetFramework="net45" />
66
<package id="Microsoft.WindowsAzure.ConfigurationManager" version="2.0.3" targetFramework="net45" />
77
<package id="Newtonsoft.Json" version="7.0.1" targetFramework="net45" />
8-
<package id="Octopus.Client" version="3.2.0" targetFramework="net45" />
8+
<package id="Octopus.Client" version="3.2.1" targetFramework="net45" />
99
<package id="Serilog" version="1.2.25" targetFramework="net45" />
1010
<package id="Serilog.Sinks.AzureTableStorage" version="1.2.25" targetFramework="net45" />
1111
<package id="System.Spatial" version="5.2.0" targetFramework="net45" />

0 commit comments

Comments
 (0)