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

Commit 08f49a0

Browse files
ob1devob1dev
committed
Moved the 'log4net' section to the 'Sitecore.Azure.Diagnostics' file.
1 parent 7cf303c commit 08f49a0

3 files changed

Lines changed: 63 additions & 143 deletions

File tree

‎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/Web.Debug.config‎

Lines changed: 0 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -10,74 +10,4 @@
1010
xdt:Transform="Insert" />
1111
</appSettings>
1212

13-
<log4net>
14-
<!-- LOGGING SETTINGS
15-
16-
blobUri - The URI of the blob that is addressable using the following URL format:
17-
- Local Environment: http://<storage account>.blob.core.windows.net/<container>/<blob>
18-
- Role Environment: http://<storage account>.blob.core.windows.net/<container>/<DeploymentId>/<RoleInstanceId>/<blob>
19-
-->
20-
<appender name="AzureBlobStorageAppender" type="Sitecore.Azure.Diagnostics.Appenders.AzureBlobStorageAppender, Sitecore.Azure.Diagnostics"
21-
xdt:Transform="Insert" >
22-
<blobUri value="log.{date}.txt" />
23-
<layout type="log4net.Layout.PatternLayout">
24-
<conversionPattern value="%4t %d{ABSOLUTE} %-5p %m%n" />
25-
</layout>
26-
</appender>
27-
<appender name="WebDAVAzureBlobStorageAppender" type="Sitecore.Azure.Diagnostics.Appenders.AzureBlobStorageAppender, Sitecore.Azure.Diagnostics"
28-
xdt:Transform="Insert" >
29-
<blobUri value="WebDAV.log.{date}.txt" />
30-
<layout type="log4net.Layout.PatternLayout">
31-
<conversionPattern value="%4t %d{ABSOLUTE} %-5p %m%n" />
32-
</layout>
33-
</appender>
34-
<appender name="SearchAzureBlobStorageAppender" type="Sitecore.Azure.Diagnostics.Appenders.AzureBlobStorageAppender, Sitecore.Azure.Diagnostics"
35-
xdt:Transform="Insert" >
36-
<blobUri value="Search.log.{date}.txt" />
37-
<layout type="log4net.Layout.PatternLayout">
38-
<conversionPattern value="%4t %d{ABSOLUTE} %-5p %m%n" />
39-
</layout>
40-
</appender>
41-
<appender name="CrawlingAzureBlobStorageAppender" type="Sitecore.Azure.Diagnostics.Appenders.AzureBlobStorageAppender, Sitecore.Azure.Diagnostics"
42-
xdt:Transform="Insert" >
43-
<blobUri value="Crawling.log.{date}.txt" />
44-
<layout type="log4net.Layout.PatternLayout">
45-
<conversionPattern value="%4t %d{ABSOLUTE} %-5p %m%n" />
46-
</layout>
47-
</appender>
48-
<appender name="PublishingAzureBlobStorageAppender" type="Sitecore.Azure.Diagnostics.Appenders.AzureBlobStorageAppender, Sitecore.Azure.Diagnostics"
49-
xdt:Transform="Insert" >
50-
<blobUri value="Publishing.log.{date}.txt" />
51-
<layout type="log4net.Layout.PatternLayout">
52-
<conversionPattern value="%4t %d{ABSOLUTE} %-5p %m%n" />
53-
</layout>
54-
</appender>
55-
56-
<root>
57-
<appender-ref ref="AzureBlobStorageAppender"
58-
xdt:Transform="Insert" />
59-
</root>
60-
61-
<logger name="Sitecore.Diagnostics.WebDAV" additivity="false"
62-
xdt:Transform="Insert" >
63-
<level value="INFO" />
64-
<appender-ref ref="WebDAVAzureBlobStorageAppender" />
65-
</logger>
66-
<logger name="Sitecore.Diagnostics.Search" additivity="false"
67-
xdt:Transform="Insert" >
68-
<level value="INFO" />
69-
<appender-ref ref="SearchAzureBlobStorageAppender" />
70-
</logger>
71-
<logger name="Sitecore.Diagnostics.Crawling" additivity="false"
72-
xdt:Transform="Insert">
73-
<level value="INFO" />
74-
<appender-ref ref="CrawlingAzureBlobStorageAppender" />
75-
</logger>
76-
<logger name="Sitecore.Diagnostics.Publishing" additivity="false"
77-
xdt:Transform="Insert">
78-
<level value="INFO" />
79-
<appender-ref ref="PublishingAzureBlobStorageAppender" />
80-
</logger>
81-
</log4net>
82-
8313
</configuration>

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

Lines changed: 0 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -9,75 +9,5 @@
99
value="DefaultEndpointsProtocol=https;AccountName={account-name};AccountKey={account-key}"
1010
xdt:Transform="Insert" />
1111
</appSettings>
12-
13-
<log4net>
14-
<!-- LOGGING SETTINGS
15-
16-
blobUri - The URI of the blob that is addressable using the following URL format:
17-
- Local Environment: http://<storage account>.blob.core.windows.net/<container>/<blob>
18-
- Role Environment: http://<storage account>.blob.core.windows.net/<container>/<DeploymentId>/<RoleInstanceId>/<blob>
19-
-->
20-
<appender name="AzureBlobStorageAppender" type="Sitecore.Azure.Diagnostics.Appenders.AzureBlobStorageAppender, Sitecore.Azure.Diagnostics"
21-
xdt:Transform="Insert" >
22-
<blobUri value="log.{date}.txt" />
23-
<layout type="log4net.Layout.PatternLayout">
24-
<conversionPattern value="%4t %d{ABSOLUTE} %-5p %m%n" />
25-
</layout>
26-
</appender>
27-
<appender name="WebDAVAzureBlobStorageAppender" type="Sitecore.Azure.Diagnostics.Appenders.AzureBlobStorageAppender, Sitecore.Azure.Diagnostics"
28-
xdt:Transform="Insert" >
29-
<blobUri value="WebDAV.log.{date}.txt" />
30-
<layout type="log4net.Layout.PatternLayout">
31-
<conversionPattern value="%4t %d{ABSOLUTE} %-5p %m%n" />
32-
</layout>
33-
</appender>
34-
<appender name="SearchAzureBlobStorageAppender" type="Sitecore.Azure.Diagnostics.Appenders.AzureBlobStorageAppender, Sitecore.Azure.Diagnostics"
35-
xdt:Transform="Insert" >
36-
<blobUri value="Search.log.{date}.txt" />
37-
<layout type="log4net.Layout.PatternLayout">
38-
<conversionPattern value="%4t %d{ABSOLUTE} %-5p %m%n" />
39-
</layout>
40-
</appender>
41-
<appender name="CrawlingAzureBlobStorageAppender" type="Sitecore.Azure.Diagnostics.Appenders.AzureBlobStorageAppender, Sitecore.Azure.Diagnostics"
42-
xdt:Transform="Insert" >
43-
<blobUri value="Crawling.log.{date}.txt" />
44-
<layout type="log4net.Layout.PatternLayout">
45-
<conversionPattern value="%4t %d{ABSOLUTE} %-5p %m%n" />
46-
</layout>
47-
</appender>
48-
<appender name="PublishingAzureBlobStorageAppender" type="Sitecore.Azure.Diagnostics.Appenders.AzureBlobStorageAppender, Sitecore.Azure.Diagnostics"
49-
xdt:Transform="Insert" >
50-
<blobUri value="Publishing.log.{date}.txt" />
51-
<layout type="log4net.Layout.PatternLayout">
52-
<conversionPattern value="%4t %d{ABSOLUTE} %-5p %m%n" />
53-
</layout>
54-
</appender>
55-
56-
<root>
57-
<appender-ref ref="AzureBlobStorageAppender"
58-
xdt:Transform="Insert" />
59-
</root>
60-
61-
<logger name="Sitecore.Diagnostics.WebDAV" additivity="false"
62-
xdt:Transform="Insert" >
63-
<level value="INFO" />
64-
<appender-ref ref="WebDAVAzureBlobStorageAppender" />
65-
</logger>
66-
<logger name="Sitecore.Diagnostics.Search" additivity="false"
67-
xdt:Transform="Insert" >
68-
<level value="INFO" />
69-
<appender-ref ref="SearchAzureBlobStorageAppender" />
70-
</logger>
71-
<logger name="Sitecore.Diagnostics.Crawling" additivity="false"
72-
xdt:Transform="Insert">
73-
<level value="INFO" />
74-
<appender-ref ref="CrawlingAzureBlobStorageAppender" />
75-
</logger>
76-
<logger name="Sitecore.Diagnostics.Publishing" additivity="false"
77-
xdt:Transform="Insert">
78-
<level value="INFO" />
79-
<appender-ref ref="PublishingAzureBlobStorageAppender" />
80-
</logger>
81-
</log4net>
8212

8313
</configuration>

0 commit comments

Comments
 (0)