Test: Added a new MiddleWare to test the Gracefulshutdown message (#233)
Added TestMiddleWare to handle the Gracefulshutdown message instead of IISMiddleware
This commit is contained in:
parent
c315b27ad9
commit
13312109ff
|
|
@ -0,0 +1,31 @@
|
|||
// Copyright (c) .NET Foundation. All rights reserved.
|
||||
// Licensed under the MIT License. See License.txt in the project root for license information.
|
||||
|
||||
using System;
|
||||
using Microsoft.AspNetCore.Builder;
|
||||
using Microsoft.AspNetCore.Hosting;
|
||||
using Microsoft.AspNetCore.Http;
|
||||
using Microsoft.AspNetCore.Server.IISIntegration;
|
||||
|
||||
namespace AspnetCoreModule.TestSites.Standard
|
||||
{
|
||||
internal class IISSetupFilter : IStartupFilter
|
||||
{
|
||||
private readonly string _pairingToken;
|
||||
|
||||
internal IISSetupFilter(string pairingToken)
|
||||
{
|
||||
_pairingToken = pairingToken;
|
||||
}
|
||||
|
||||
public Action<IApplicationBuilder> Configure(Action<IApplicationBuilder> next)
|
||||
{
|
||||
return app =>
|
||||
{
|
||||
app.UseMiddleware<TestMiddleWareBeforeIISMiddleWare>();
|
||||
app.UseMiddleware<IISMiddleware>(_pairingToken);
|
||||
next(app);
|
||||
};
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -2,13 +2,13 @@
|
|||
// Licensed under the MIT License. See License.txt in the project root for license information.
|
||||
|
||||
using Microsoft.AspNetCore.Hosting;
|
||||
using Microsoft.AspNetCore.Server.Kestrel.Https;
|
||||
using Microsoft.Extensions.Configuration;
|
||||
using System;
|
||||
using System.IO;
|
||||
using System.Security.Cryptography.X509Certificates;
|
||||
using System.Threading;
|
||||
using System.Net;
|
||||
using Microsoft.AspNetCore.Builder;
|
||||
using Microsoft.Extensions.DependencyInjection;
|
||||
|
||||
namespace AspnetCoreModule.TestSites.Standard
|
||||
{
|
||||
|
|
@ -88,8 +88,15 @@ namespace AspnetCoreModule.TestSites.Standard
|
|||
else
|
||||
{
|
||||
builder = new WebHostBuilder()
|
||||
.ConfigureServices(services =>
|
||||
{
|
||||
const string PairingToken = "TOKEN";
|
||||
string paringToken = builder.GetSetting(PairingToken) ?? Environment.GetEnvironmentVariable($"ASPNETCORE_{PairingToken}");
|
||||
services.AddSingleton<IStartupFilter>(
|
||||
new IISSetupFilter(paringToken)
|
||||
);
|
||||
})
|
||||
.UseConfiguration(config)
|
||||
.UseIISIntegration()
|
||||
.UseStartup<Startup>();
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -256,7 +256,7 @@ namespace AspnetCoreModule.TestSites.Standard
|
|||
}
|
||||
long size = Convert.ToInt32(parameter);
|
||||
var rnd = new Random();
|
||||
byte[] b = new byte[size*1024];
|
||||
byte[] b = new byte[size * 1024];
|
||||
b[rnd.Next(0, b.Length)] = byte.MaxValue;
|
||||
MemoryLeakList.Add(b);
|
||||
response = "MemoryLeak, size:" + size.ToString() + " KB, total: " + MemoryLeakList.Count.ToString();
|
||||
|
|
@ -344,20 +344,6 @@ namespace AspnetCoreModule.TestSites.Standard
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Handle shutdown event from ANCM
|
||||
if (HttpMethods.IsPost(context.Request.Method) &&
|
||||
//context.Request.Path.Equals(ANCMRequestPath) &&
|
||||
string.Equals("shutdown", context.Request.Headers["MS-ASPNETCORE-EVENT"], StringComparison.OrdinalIgnoreCase))
|
||||
{
|
||||
response = "shutdown";
|
||||
string shutdownMode = Environment.GetEnvironmentVariable("GracefulShutdown");
|
||||
if (String.IsNullOrEmpty(shutdownMode) || !shutdownMode.ToLower().StartsWith("disabled"))
|
||||
{
|
||||
context.Response.StatusCode = StatusCodes.Status202Accepted;
|
||||
Program.AappLifetime.StopApplication();
|
||||
}
|
||||
}
|
||||
return context.Response.WriteAsync(response);
|
||||
});
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,43 @@
|
|||
// Copyright (c) .NET Foundation. All rights reserved.
|
||||
// Licensed under the MIT License. See License.txt in the project root for license information.
|
||||
|
||||
using Microsoft.AspNetCore.Http;
|
||||
using System;
|
||||
using System.Security.Principal;
|
||||
using System.Threading.Tasks;
|
||||
|
||||
|
||||
namespace AspnetCoreModule.TestSites.Standard
|
||||
|
||||
{
|
||||
public class TestMiddleWareBeforeIISMiddleWare
|
||||
{
|
||||
private readonly RequestDelegate next;
|
||||
|
||||
public TestMiddleWareBeforeIISMiddleWare(RequestDelegate next)
|
||||
{
|
||||
this.next = next;
|
||||
}
|
||||
|
||||
public async Task Invoke(HttpContext context)
|
||||
{
|
||||
// if the given request is shutdown message from ANCM and the value of GracefulShutdown environment variable is set,
|
||||
// the shutdown message is handled by this middleware instead of IISMiddleware.
|
||||
|
||||
if (HttpMethods.IsPost(context.Request.Method) &&
|
||||
context.Request.Path.ToString().EndsWith("/iisintegration") &&
|
||||
string.Equals("shutdown", context.Request.Headers["MS-ASPNETCORE-EVENT"], StringComparison.OrdinalIgnoreCase))
|
||||
{
|
||||
string shutdownMode = Environment.GetEnvironmentVariable("GracefulShutdown");
|
||||
if (!string.IsNullOrWhiteSpace(shutdownMode) && shutdownMode.ToLower().StartsWith("disabled"))
|
||||
{
|
||||
//ignore shutdown Message returning 200 instead of 202 because the gracefulshutdown is disabled
|
||||
context.Response.StatusCode = StatusCodes.Status200OK;
|
||||
await context.Response.WriteAsync("Called ShutdownMessage with disabled of GracefulShutdown");
|
||||
return;
|
||||
}
|
||||
}
|
||||
await next.Invoke(context);
|
||||
}
|
||||
}
|
||||
}
|
||||
Loading…
Reference in New Issue