mirror of
https://github.com/OrchardCMS/Orchard.git
synced 2025-10-21 11:17:28 +08:00
Added diagnostics configuration in Orchard.Azure.CloudService.
Fixed enumeration bug in AzureConfigShellSettingsManager. Added missing cache client library references.
This commit is contained in:

committed by
Sebastien Ros

parent
d0fe93fa66
commit
b44c1a342d
@@ -49,13 +49,18 @@
|
||||
<SpecificVersion>False</SpecificVersion>
|
||||
<HintPath>..\..\..\..\lib\log4net\log4net.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Microsoft.ApplicationServer.Caching.AzureClientHelper, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
|
||||
<Reference Include="Microsoft.ApplicationServer.Caching.AzureCommon, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
|
||||
<Reference Include="Microsoft.ApplicationServer.Caching.Client, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
|
||||
<Reference Include="Microsoft.ApplicationServer.Caching.Core, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
|
||||
<Reference Include="Microsoft.CSharp" />
|
||||
<Reference Include="Microsoft.Web.DistributedCache, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
|
||||
<Reference Include="Microsoft.WindowsAzure.Configuration, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
|
||||
<Reference Include="Microsoft.WindowsAzure.Diagnostics, Version=2.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
|
||||
<Reference Include="Microsoft.WindowsAzure.ServiceRuntime, Version=2.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
|
||||
<Reference Include="Microsoft.WindowsAzure.Storage, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
|
||||
<Reference Include="Microsoft.WindowsFabric.Common, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
|
||||
<Reference Include="Microsoft.WindowsFabric.Data.Common, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
|
||||
<Reference Include="NHibernate, Version=3.3.1.4000, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
|
||||
<SpecificVersion>False</SpecificVersion>
|
||||
<HintPath>..\..\..\..\lib\nhibernate\NHibernate.dll</HintPath>
|
||||
|
@@ -63,7 +63,7 @@ namespace Orchard.Azure.Services.Environment.Configuration {
|
||||
var settingsList = base.LoadSettings();
|
||||
|
||||
foreach (var settings in settingsList) {
|
||||
foreach (var key in settings.Keys) {
|
||||
foreach (var key in settings.Keys.ToArray()) {
|
||||
var cloudConfigurationKey = String.Format("{0}.{1}.{2}", _prefix, settings.Name, key);
|
||||
var cloudConfigurationValue = ParseValue(CloudConfigurationManager.GetSetting(cloudConfigurationKey));
|
||||
if (cloudConfigurationValue != null)
|
||||
|
@@ -2,6 +2,7 @@
|
||||
using Microsoft.WindowsAzure.Diagnostics;
|
||||
using log4net.Appender;
|
||||
using log4net.Core;
|
||||
using System.Diagnostics;
|
||||
|
||||
namespace Orchard.Azure.Services.Logging {
|
||||
|
||||
@@ -11,7 +12,7 @@ namespace Orchard.Azure.Services.Logging {
|
||||
public class AzureDiagnosticsAppender : AppenderSkeleton {
|
||||
|
||||
private const string _wadStorageAccountConnectionStringSettingName = "Microsoft.WindowsAzure.Plugins.Diagnostics.ConnectionString";
|
||||
|
||||
|
||||
public AzureDiagnosticsAppender() {
|
||||
var defaultDiagnostics = DiagnosticMonitor.GetDefaultInitialConfiguration();
|
||||
var period = TimeSpan.FromMinutes(1d);
|
||||
@@ -25,7 +26,7 @@ namespace Orchard.Azure.Services.Logging {
|
||||
|
||||
protected override void Append(LoggingEvent loggingEvent) {
|
||||
var formattedMessage = RenderLoggingEvent(loggingEvent);
|
||||
System.Diagnostics.Trace.WriteLine(formattedMessage);
|
||||
Trace.WriteLine(formattedMessage);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user