Skip to content
This repository was archived by the owner on Nov 10, 2017. It is now read-only.

Commit 99d73b9

Browse files
ob1devob1dev
authored
Merge pull request #9 from olegburov/Issue-#7
Fixed Issue #7
2 parents 7cf303c + 0851b99 commit 99d73b9

8 files changed

Lines changed: 126 additions & 4200 deletions

File tree

‎src/Sitecore.Azure.Diagnostics.sln‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,26 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
33
# Visual Studio 14
4-
VisualStudioVersion = 14.0.23107.0
4+
VisualStudioVersion = 14.0.25420.1
55
MinimumVisualStudioVersion = 10.0.40219.1
6-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Sitecore.Azure.Diagnostics", "Sitecore.Azure.Diagnostics\Sitecore.Azure.Diagnostics.csproj", "{462F779D-7CCF-47DB-B25B-ECE660F5CC68}"
7-
EndProject
86
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Sitecore.Azure.Diagnostics.UI", "Sitecore.Azure.Diagnostics.UI\Sitecore.Azure.Diagnostics.UI.csproj", "{9B619A8D-05AB-4060-A28E-7A7B6E1F37E8}"
97
EndProject
8+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Sitecore.Azure.Diagnostics", "Sitecore.Azure.Diagnostics\Sitecore.Azure.Diagnostics.csproj", "{D6AF82E8-2120-4573-90FF-795A10C7D460}"
9+
EndProject
1010
Global
1111
GlobalSection(SolutionConfigurationPlatforms) = preSolution
1212
Debug|Any CPU = Debug|Any CPU
1313
Release|Any CPU = Release|Any CPU
1414
EndGlobalSection
1515
GlobalSection(ProjectConfigurationPlatforms) = postSolution
16-
{462F779D-7CCF-47DB-B25B-ECE660F5CC68}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
17-
{462F779D-7CCF-47DB-B25B-ECE660F5CC68}.Debug|Any CPU.Build.0 = Debug|Any CPU
18-
{462F779D-7CCF-47DB-B25B-ECE660F5CC68}.Release|Any CPU.ActiveCfg = Release|Any CPU
19-
{462F779D-7CCF-47DB-B25B-ECE660F5CC68}.Release|Any CPU.Build.0 = Release|Any CPU
2016
{9B619A8D-05AB-4060-A28E-7A7B6E1F37E8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
2117
{9B619A8D-05AB-4060-A28E-7A7B6E1F37E8}.Debug|Any CPU.Build.0 = Debug|Any CPU
2218
{9B619A8D-05AB-4060-A28E-7A7B6E1F37E8}.Release|Any CPU.ActiveCfg = Release|Any CPU
2319
{9B619A8D-05AB-4060-A28E-7A7B6E1F37E8}.Release|Any CPU.Build.0 = Release|Any CPU
20+
{D6AF82E8-2120-4573-90FF-795A10C7D460}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
21+
{D6AF82E8-2120-4573-90FF-795A10C7D460}.Debug|Any CPU.Build.0 = Debug|Any CPU
22+
{D6AF82E8-2120-4573-90FF-795A10C7D460}.Release|Any CPU.ActiveCfg = Release|Any CPU
23+
{D6AF82E8-2120-4573-90FF-795A10C7D460}.Release|Any CPU.Build.0 = Release|Any CPU
2424
EndGlobalSection
2525
GlobalSection(SolutionProperties) = preSolution
2626
HideSolutionNode = FALSE

‎src/Sitecore.Azure.Diagnostics/App_Config/Include/Sitecore.Azure.Diagnostics.config‎

Lines changed: 63 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<add name="sitecore" type="Sitecore.Azure.Diagnostics.Storage.AzureBlobStorageProvider, Sitecore.Azure.Diagnostics" blobContainerName="sitecore-logs" blobContainerPublicAccess="Off" textEncoding="UTF8" />
2121
</providers>
2222
</logStorageManager>
23-
23+
2424
<scheduling>
2525
<!-- Agent to clean up blobs -->
2626
<agent type="Sitecore.Azure.Diagnostics.Tasks.BlobsCleanupAgent" method="Run" interval="06:00:00">
@@ -39,14 +39,74 @@
3939
</blobs>
4040
</agent>
4141
</scheduling>
42-
42+
4343
<settings>
4444
<!-- AZURE STORAGE CONNECTION STRING APP SETTING NAME
4545
Defines the AppSetting name that contains the connection string to Azure Storage.
4646
Default: StorageConnectionString
4747
-->
4848
<setting name="Azure.Storage.ConnectionString.AppSettingName" value="StorageConnectionString" />
4949
</settings>
50-
50+
51+
<log4net>
52+
<!-- LOGGING SETTINGS
53+
54+
blobUri - The URI of the blob that is addressable using the following URL format:
55+
- Local Environment: http://<storage account>.blob.core.windows.net/<container>/<blob>
56+
- Role Environment: http://<storage account>.blob.core.windows.net/<container>/<DeploymentId>/<RoleInstanceId>/<blob>
57+
-->
58+
<appender name="AzureBlobStorageAppender" type="Sitecore.Azure.Diagnostics.Appenders.AzureBlobStorageAppender, Sitecore.Azure.Diagnostics">
59+
<blobUri value="log.{date}.txt" />
60+
<layout type="log4net.Layout.PatternLayout">
61+
<conversionPattern value="%4t %d{ABSOLUTE} %-5p %m%n" />
62+
</layout>
63+
</appender>
64+
<appender name="WebDAVAzureBlobStorageAppender" type="Sitecore.Azure.Diagnostics.Appenders.AzureBlobStorageAppender, Sitecore.Azure.Diagnostics">
65+
<blobUri value="WebDAV.log.{date}.txt" />
66+
<layout type="log4net.Layout.PatternLayout">
67+
<conversionPattern value="%4t %d{ABSOLUTE} %-5p %m%n" />
68+
</layout>
69+
</appender>
70+
<appender name="SearchAzureBlobStorageAppender" type="Sitecore.Azure.Diagnostics.Appenders.AzureBlobStorageAppender, Sitecore.Azure.Diagnostics">
71+
<blobUri value="Search.log.{date}.txt" />
72+
<layout type="log4net.Layout.PatternLayout">
73+
<conversionPattern value="%4t %d{ABSOLUTE} %-5p %m%n" />
74+
</layout>
75+
</appender>
76+
<appender name="CrawlingAzureBlobStorageAppender" type="Sitecore.Azure.Diagnostics.Appenders.AzureBlobStorageAppender, Sitecore.Azure.Diagnostics">
77+
<blobUri value="Crawling.log.{date}.txt" />
78+
<layout type="log4net.Layout.PatternLayout">
79+
<conversionPattern value="%4t %d{ABSOLUTE} %-5p %m%n" />
80+
</layout>
81+
</appender>
82+
<appender name="PublishingAzureBlobStorageAppender" type="Sitecore.Azure.Diagnostics.Appenders.AzureBlobStorageAppender, Sitecore.Azure.Diagnostics">
83+
<blobUri value="Publishing.log.{date}.txt" />
84+
<layout type="log4net.Layout.PatternLayout">
85+
<conversionPattern value="%4t %d{ABSOLUTE} %-5p %m%n" />
86+
</layout>
87+
</appender>
88+
89+
<root>
90+
<appender-ref ref="AzureBlobStorageAppender" />
91+
</root>
92+
93+
<logger name="Sitecore.Diagnostics.WebDAV" additivity="false">
94+
<level value="INFO" />
95+
<appender-ref ref="WebDAVAzureBlobStorageAppender" />
96+
</logger>
97+
<logger name="Sitecore.Diagnostics.Search" additivity="false">
98+
<level value="INFO" />
99+
<appender-ref ref="SearchAzureBlobStorageAppender" />
100+
</logger>
101+
<logger name="Sitecore.Diagnostics.Crawling" additivity="false">
102+
<level value="INFO" />
103+
<appender-ref ref="CrawlingAzureBlobStorageAppender" />
104+
</logger>
105+
<logger name="Sitecore.Diagnostics.Publishing" additivity="false">
106+
<level value="INFO" />
107+
<appender-ref ref="PublishingAzureBlobStorageAppender" />
108+
</logger>
109+
</log4net>
110+
51111
</sitecore>
52112
</configuration>

‎src/Sitecore.Azure.Diagnostics/Properties/AssemblyInfo.cs‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
using System.Reflection;
2+
using System.Runtime.CompilerServices;
23
using System.Runtime.InteropServices;
34

45
// General Information about an assembly is controlled through the following
@@ -21,7 +22,7 @@
2122
[assembly: ComVisible(false)]
2223

2324
// The following GUID is for the ID of the typelib if this project is exposed to COM
24-
[assembly: Guid("96eb7def-4710-43b9-b70b-47f4b8e0cd55")]
25+
[assembly: Guid("d6af82e8-2120-4573-90ff-795a10c7d460")]
2526

2627
// Version information for an assembly consists of the following four values:
2728
//
@@ -30,7 +31,8 @@
3031
// Build Number
3132
// Revision
3233
//
33-
// You can specify all the values or you can default the Revision and Build Numbers
34+
// You can specify all the values or you can default the Build and Revision Numbers
3435
// by using the '*' as shown below:
36+
// [assembly: AssemblyVersion("1.0.*")]
3537
[assembly: AssemblyVersion("7.5.0.5189")]
36-
[assembly: AssemblyFileVersion("7.5.0.5189")]
38+
[assembly: AssemblyFileVersion("7.5.0.5189")]

‎src/Sitecore.Azure.Diagnostics/Sitecore.Azure.Diagnostics.csproj‎

Lines changed: 28 additions & 77 deletions
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,30 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2+
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
44
<PropertyGroup>
55
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
66
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
7-
<ProductVersion>
8-
</ProductVersion>
9-
<SchemaVersion>2.0</SchemaVersion>
10-
<ProjectGuid>{462F779D-7CCF-47DB-B25B-ECE660F5CC68}</ProjectGuid>
11-
<ProjectTypeGuids>{349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
7+
<ProjectGuid>{D6AF82E8-2120-4573-90FF-795A10C7D460}</ProjectGuid>
128
<OutputType>Library</OutputType>
139
<AppDesignerFolder>Properties</AppDesignerFolder>
1410
<RootNamespace>Sitecore.Azure.Diagnostics</RootNamespace>
1511
<AssemblyName>Sitecore.Azure.Diagnostics</AssemblyName>
1612
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
17-
<UseIISExpress>true</UseIISExpress>
18-
<IISExpressSSLPort />
19-
<IISExpressAnonymousAuthentication />
20-
<IISExpressWindowsAuthentication />
21-
<IISExpressUseClassicPipelineMode />
22-
<SccProjectName>SAK</SccProjectName>
23-
<SccLocalPath>SAK</SccLocalPath>
24-
<SccAuxPath>SAK</SccAuxPath>
25-
<SccProvider>SAK</SccProvider>
26-
<UseGlobalApplicationHostFile />
13+
<FileAlignment>512</FileAlignment>
2714
</PropertyGroup>
2815
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
2916
<DebugSymbols>true</DebugSymbols>
3017
<DebugType>full</DebugType>
3118
<Optimize>false</Optimize>
32-
<OutputPath>bin\</OutputPath>
19+
<OutputPath>bin\Debug\</OutputPath>
3320
<DefineConstants>DEBUG;TRACE</DefineConstants>
3421
<ErrorReport>prompt</ErrorReport>
3522
<WarningLevel>4</WarningLevel>
36-
<RunCodeAnalysis>true</RunCodeAnalysis>
3723
</PropertyGroup>
3824
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
3925
<DebugType>pdbonly</DebugType>
4026
<Optimize>true</Optimize>
41-
<OutputPath>bin\</OutputPath>
27+
<OutputPath>bin\Release\</OutputPath>
4228
<DefineConstants>TRACE</DefineConstants>
4329
<ErrorReport>prompt</ErrorReport>
4430
<WarningLevel>4</WarningLevel>
@@ -80,79 +66,44 @@
8066
<HintPath>..\packages\SC.Sitecore.Logging.8.1.3.160519\lib\Sitecore.Logging.dll</HintPath>
8167
<Private>False</Private>
8268
</Reference>
83-
<Reference Include="System.Data" />
69+
<Reference Include="System" />
70+
<Reference Include="System.Configuration" />
71+
<Reference Include="System.Core" />
8472
<Reference Include="System.Spatial, Version=5.7.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
8573
<HintPath>..\packages\System.Spatial.5.7.0\lib\net40\System.Spatial.dll</HintPath>
8674
<Private>True</Private>
8775
</Reference>
88-
<Reference Include="System.Web.ApplicationServices" />
89-
<Reference Include="System" />
90-
<Reference Include="System.Core" />
91-
<Reference Include="System.Web" />
76+
<Reference Include="System.Xml.Linq" />
77+
<Reference Include="System.Data.DataSetExtensions" />
78+
<Reference Include="Microsoft.CSharp" />
79+
<Reference Include="System.Data" />
80+
<Reference Include="System.Net.Http" />
9281
<Reference Include="System.Xml" />
93-
<Reference Include="System.Configuration" />
94-
</ItemGroup>
95-
<ItemGroup>
96-
<Content Include="App_Config\Include\Sitecore.Azure.Diagnostics.config">
97-
<SubType>Designer</SubType>
98-
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
99-
</Content>
100-
<None Include="packages.config">
101-
<SubType>Designer</SubType>
102-
</None>
103-
<None Include="Properties\PublishProfiles\sc72rev140526.pubxml" />
104-
<None Include="Properties\PublishProfiles\sc75rev141003.pubxml" />
105-
<None Include="Web.Debug.config">
106-
<DependentUpon>Web.config</DependentUpon>
107-
<SubType>Designer</SubType>
108-
</None>
109-
<None Include="Web.Release.config">
110-
<DependentUpon>Web.config</DependentUpon>
111-
<SubType>Designer</SubType>
112-
</None>
113-
</ItemGroup>
114-
<ItemGroup>
115-
<Content Include="Web.config">
116-
<SubType>Designer</SubType>
117-
</Content>
11882
</ItemGroup>
11983
<ItemGroup>
12084
<Compile Include="Appenders\AzureBlobStorageAppender.cs" />
85+
<Compile Include="Properties\AssemblyInfo.cs" />
12186
<Compile Include="Storage\AzureBlobStorageProvider.cs" />
12287
<Compile Include="Storage\AzureBlobStorageProviderCollection.cs" />
123-
<Compile Include="Properties\AssemblyInfo.cs" />
124-
<Compile Include="Storage\RetryPolicies\ContainerBeingDeletedRetryPolicy.cs" />
12588
<Compile Include="Storage\LogStorageManager.cs" />
89+
<Compile Include="Storage\RetryPolicies\ContainerBeingDeletedRetryPolicy.cs" />
12690
<Compile Include="Tasks\BlobCleaner.cs" />
12791
<Compile Include="Tasks\BlobsCleanupAgent.cs" />
12892
<Compile Include="Tasks\IBlobCleaner.cs" />
12993
</ItemGroup>
130-
<ItemGroup />
131-
<PropertyGroup>
132-
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
133-
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
134-
</PropertyGroup>
135-
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
136-
<Import Project="$(VSToolsPath)\WebApplications\Microsoft.WebApplication.targets" Condition="'$(VSToolsPath)' != ''" />
137-
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" Condition="false" />
138-
<ProjectExtensions>
139-
<VisualStudio>
140-
<FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
141-
<WebProjectProperties>
142-
<UseIIS>True</UseIIS>
143-
<AutoAssignPort>True</AutoAssignPort>
144-
<DevelopmentServerPort>49747</DevelopmentServerPort>
145-
<DevelopmentServerVPath>/</DevelopmentServerVPath>
146-
<IISUrl>http://localhost:49747/</IISUrl>
147-
<NTLMAuthentication>False</NTLMAuthentication>
148-
<UseCustomServer>False</UseCustomServer>
149-
<CustomServerUrl>
150-
</CustomServerUrl>
151-
<SaveServerSettingsInUserFile>False</SaveServerSettingsInUserFile>
152-
</WebProjectProperties>
153-
</FlavorProperties>
154-
</VisualStudio>
155-
</ProjectExtensions>
94+
<ItemGroup>
95+
<Content Include="App_Config\Include\Sitecore.Azure.Diagnostics.config">
96+
<SubType>Designer</SubType>
97+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
98+
</Content>
99+
</ItemGroup>
100+
<ItemGroup>
101+
<None Include="app.config">
102+
<SubType>Designer</SubType>
103+
</None>
104+
<None Include="packages.config" />
105+
</ItemGroup>
106+
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
156107
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
157108
Other similar extension points exist, see Microsoft.Common.targets.
158109
<Target Name="BeforeBuild">

‎src/Sitecore.Azure.Diagnostics/Web.Debug.config‎

Lines changed: 0 additions & 83 deletions
This file was deleted.

0 commit comments

Comments
 (0)