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

Minor cleanup and formatting.

Browse Source
This commit is contained in:
Sipke Schoorstra
2015-08-12 15:07:15 +01:00
parent f39b273558
commit 4cd88cb9c9
1 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/Orchard/Environment/DefaultOrchardShell.cs
View File

@@ -1,7 +1,6 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Threading.Tasks;
using Autofac.Features.OwnedInstances; using Autofac.Features.OwnedInstances;
using Microsoft.Owin.Builder; using Microsoft.Owin.Builder;
using Orchard.Environment.Configuration; using Orchard.Environment.Configuration;
@@ -12,7 +11,6 @@ using Orchard.Owin;
using Orchard.Tasks; using Orchard.Tasks;
using Orchard.UI; using Orchard.UI;
using Orchard.WebApi.Routes; using Orchard.WebApi.Routes;
using Owin;
using IModelBinderProvider = Orchard.Mvc.ModelBinders.IModelBinderProvider; using IModelBinderProvider = Orchard.Mvc.ModelBinders.IModelBinderProvider;
namespace Orchard.Environment { namespace Orchard.Environment {
@@ -37,6 +35,7 @@ namespace Orchard.Environment {
ISweepGenerator sweepGenerator, ISweepGenerator sweepGenerator,
IEnumerable<IOwinMiddlewareProvider> owinMiddlewareProviders, IEnumerable<IOwinMiddlewareProvider> owinMiddlewareProviders,
ShellSettings shellSettings) { ShellSettings shellSettings) {
_eventsFactory = eventsFactory; _eventsFactory = eventsFactory;
_routeProviders = routeProviders; _routeProviders = routeProviders;
_httpRouteProviders = httpRouteProviders; _httpRouteProviders = httpRouteProviders;
@@ -53,7 +52,7 @@ namespace Orchard.Environment {
public ILogger Logger { get; set; } public ILogger Logger { get; set; }
public void Activate() { public void Activate() {
IAppBuilder appBuilder = new AppBuilder(); var appBuilder = new AppBuilder();
appBuilder.Properties["host.AppName"] = _shellSettings.Name; appBuilder.Properties["host.AppName"] = _shellSettings.Name;
var orderedMiddlewares = _owinMiddlewareProviders var orderedMiddlewares = _owinMiddlewareProviders
@@ -64,11 +63,10 @@ namespace Orchard.Environment {
middleware.Configure(appBuilder); middleware.Configure(appBuilder);
} }
// register the Orchard middleware after all others // Register the Orchard middleware after all others.
appBuilder.UseOrchard(); appBuilder.UseOrchard();
Func<IDictionary<string, object>, Task> pipeline = appBuilder.Build(); var pipeline = appBuilder.Build();
var allRoutes = new List<RouteDescriptor>(); var allRoutes = new List<RouteDescriptor>();
allRoutes.AddRange(_routeProviders.SelectMany(provider => provider.GetRoutes())); allRoutes.AddRange(_routeProviders.SelectMany(provider => provider.GetRoutes()));
allRoutes.AddRange(_httpRouteProviders.SelectMany(provider => provider.GetRoutes())); allRoutes.AddRange(_httpRouteProviders.SelectMany(provider => provider.GetRoutes()));
@@ -79,16 +77,17 @@ namespace Orchard.Environment {
using (var events = _eventsFactory()) { using (var events = _eventsFactory()) {
events.Value.Activated(); events.Value.Activated();
} }
_sweepGenerator.Activate(); _sweepGenerator.Activate();
} }
public void Terminate() { public void Terminate() {
SafelyTerminate(() => { SafelyTerminate(() => {
using (var events = _eventsFactory()) { using (var events = _eventsFactory()) {
SafelyTerminate(() => events.Value.Terminating()); var localEvents = events;
} SafelyTerminate(() => localEvents.Value.Terminating());
}); }
});
SafelyTerminate(() => _sweepGenerator.Terminate()); SafelyTerminate(() => _sweepGenerator.Terminate());
} }