lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-10-15 19:54:57 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

#20374: Fixing that tenant suspend/restart didn't take effect until an app restart

Browse Source 
Work Item: 20374
This commit is contained in:
Lombiq
2014-01-18 22:40:53 +01:00
committed by Zoltán Lehóczky
parent 1eecc1ab4d
commit 97026dd0fa
2 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/Orchard/Environment/DefaultOrchardHost.cs
View File

@@ -260,6 +260,10 @@ namespace Orchard.Environment {
// look for the associated shell context // look for the associated shell context
var shellContext = _shellContexts.FirstOrDefault(c => c.Settings.Name == settings.Name); var shellContext = _shellContexts.FirstOrDefault(c => c.Settings.Name == settings.Name);
if (shellContext == null && settings.State == TenantState.Disabled) {
return;
}
// is this is a new tenant ? or is it a tenant waiting for setup ? // is this is a new tenant ? or is it a tenant waiting for setup ?
if (shellContext == null || settings.State == TenantState.Uninitialized) { if (shellContext == null || settings.State == TenantState.Uninitialized) {
// create the Shell // create the Shell
@@ -268,6 +272,14 @@ namespace Orchard.Environment {
// activate the Shell // activate the Shell
ActivateShell(context); ActivateShell(context);
} }
// terminate the shell if the tenant was disabled
else if (settings.State == TenantState.Disabled) {
shellContext.Shell.Terminate();
shellContext.LifetimeScope.Dispose();
_runningShellTable.Remove(settings);
_shellContexts = _shellContexts.Where(shell => shell.Settings.Name != settings.Name);
}
// reload the shell as its settings have changed // reload the shell as its settings have changed
else { else {
// dispose previous context // dispose previous context

2
src/Orchard/Environment/RunningShellTable.cs
View File

@@ -101,6 +101,8 @@ namespace Orchard.Environment {
// will not be mapped to routes coming from orchard // will not be mapped to routes coming from orchard
_fallback = null; _fallback = null;
} }
_shellsByHostAndPrefix.Clear();
} }
public ShellSettings Match(HttpContextBase httpContext) { public ShellSettings Match(HttpContextBase httpContext) {