Skip to content

Commit b8fb40e

Browse files
authored
Merge pull request #187 from aspnetboilerplate/pr/5954
implement production config for log4net
2 parents 55f18b4 + a545ed3 commit b8fb40e

File tree

8 files changed

+98
-40
lines changed

8 files changed

+98
-40
lines changed

src/AbpCompanyName.AbpProjectName.WebMpa/AbpCompanyName.AbpProjectName.WebMpa.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2714,6 +2714,7 @@
27142714
<Content Include="Content\toastr.less" />
27152715
<Content Include="Scripts\bootstrap.js" />
27162716
<Content Include="Scripts\bootstrap.min.js" />
2717+
<None Include="log4net.Production.config" />
27172718
<None Include="Scripts\jquery-3.3.1.intellisense.js" />
27182719
<Content Include="Scripts\jquery-3.3.1.js" />
27192720
<Content Include="Scripts\jquery-3.3.1.min.js" />

src/AbpCompanyName.AbpProjectName.WebMpa/Global.asax.cs

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,16 @@ public class MvcApplication : AbpWebApplication<AbpProjectNameWebModule>
1111
{
1212
protected override void Application_Start(object sender, EventArgs e)
1313
{
14+
#if DEBUG
1415
AbpBootstrapper.IocManager.IocContainer.AddFacility<LoggingFacility>(
1516
f => f.UseAbpLog4Net().WithConfig(Server.MapPath("log4net.config"))
1617
);
17-
18+
#else
19+
AbpBootstrapper.IocManager.IocContainer.AddFacility<LoggingFacility>(
20+
f => f.UseAbpLog4Net().WithConfig(Server.MapPath("log4net.Production.config"))
21+
);
22+
#endif
23+
1824
base.Application_Start(sender, e);
1925
}
2026
}
Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
<?xml version="1.0" encoding="utf-8" ?>
2+
<log4net>
3+
<appender name="RollingFileAppender" type="log4net.Appender.RollingFileAppender" >
4+
<file value="App_Data/Logs/Logs.txt" />
5+
<appendToFile value="true" />
6+
<rollingStyle value="Size" />
7+
<maxSizeRollBackups value="10" />
8+
<maximumFileSize value="1000KB" />
9+
<staticLogFileName value="true" />
10+
<layout type="log4net.Layout.PatternLayout">
11+
<conversionPattern value="%-5level %date [%-5.5thread] %-40.40logger - %message%newline" />
12+
</layout>
13+
</appender>
14+
<root>
15+
<appender-ref ref="RollingFileAppender" />
16+
<level value="DEBUG" />
17+
</root>
18+
<logger name="NHibernate">
19+
<level value="WARN" />
20+
</logger>
21+
</log4net>
Lines changed: 20 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,22 @@
1-
<?xml version="1.0" encoding="utf-8" ?>
1+
<?xml version="1.0" encoding="utf-8"?>
2+
23
<log4net>
3-
<appender name="RollingFileAppender" type="log4net.Appender.RollingFileAppender" >
4-
<file value="App_Data/Logs/Logs.txt" />
5-
<appendToFile value="true" />
6-
<rollingStyle value="Size" />
7-
<maxSizeRollBackups value="10" />
8-
<maximumFileSize value="1000KB" />
9-
<staticLogFileName value="true" />
10-
<layout type="log4net.Layout.PatternLayout">
11-
<conversionPattern value="%-5level %date [%-5.5thread] %-40.40logger - %message%newline" />
12-
</layout>
13-
</appender>
14-
<root>
15-
<appender-ref ref="RollingFileAppender" />
16-
<level value="DEBUG" />
17-
</root>
18-
<logger name="NHibernate">
19-
<level value="WARN" />
20-
</logger>
4+
<appender name="RollingFileAppender" type="log4net.Appender.RollingFileAppender">
5+
<file value="App_Data/Logs/Logs.txt" />
6+
<appendToFile value="true" />
7+
<rollingStyle value="Size" />
8+
<maxSizeRollBackups value="10" />
9+
<maximumFileSize value="1000KB" />
10+
<staticLogFileName value="true" />
11+
<layout type="log4net.Layout.PatternLayout">
12+
<conversionPattern value="%-5level %date [%-5.5thread] %-40.40logger - %message%newline" />
13+
</layout>
14+
</appender>
15+
<root>
16+
<appender-ref ref="RollingFileAppender" />
17+
<level value="DEBUG" />
18+
</root>
19+
<logger name="NHibernate">
20+
<level value="WARN" />
21+
</logger>
2122
</log4net>

src/AbpCompanyName.AbpProjectName.WebSpaAngular/AbpCompanyName.AbpProjectName.WebSpaAngular.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3539,6 +3539,7 @@
35393539
<Content Include="Scripts\i18n\angular-locale_zh.js" />
35403540
<Content Include="Scripts\i18n\angular-locale_zu-za.js" />
35413541
<Content Include="Scripts\i18n\angular-locale_zu.js" />
3542+
<None Include="log4net.Production.config" />
35423543
<None Include="Scripts\jquery-3.3.1.intellisense.js" />
35433544
<Content Include="Scripts\jquery-3.3.1.js" />
35443545
<Content Include="Scripts\jquery-3.3.1.min.js" />

src/AbpCompanyName.AbpProjectName.WebSpaAngular/Global.asax.cs

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,15 @@ public class MvcApplication : AbpWebApplication<AbpProjectNameWebModule>
1111
{
1212
protected override void Application_Start(object sender, EventArgs e)
1313
{
14+
#if DEBUG
1415
AbpBootstrapper.IocManager.IocContainer.AddFacility<LoggingFacility>(
1516
f => f.UseAbpLog4Net().WithConfig(Server.MapPath("log4net.config"))
1617
);
17-
18+
#else
19+
AbpBootstrapper.IocManager.IocContainer.AddFacility<LoggingFacility>(
20+
f => f.UseAbpLog4Net().WithConfig(Server.MapPath("log4net.Production.config"))
21+
);
22+
#endif
1823
base.Application_Start(sender, e);
1924

2025
//try
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
3+
<log4net>
4+
<appender name="RollingFileAppender" type="log4net.Appender.RollingFileAppender">
5+
<file value="App_Data/Logs/Logs.txt" />
6+
<appendToFile value="true" />
7+
<rollingStyle value="Size" />
8+
<maxSizeRollBackups value="10" />
9+
<maximumFileSize value="10000KB" />
10+
<staticLogFileName value="true" />
11+
<layout type="log4net.Layout.PatternLayout">
12+
<conversionPattern value="%-5level %date [%-5.5thread] %-40.40logger - %message%newline" />
13+
</layout>
14+
</appender>
15+
<root>
16+
<appender-ref ref="RollingFileAppender" />
17+
<level value="DEBUG" />
18+
</root>
19+
<logger name="NHibernate">
20+
<level value="WARN" />
21+
</logger>
22+
</log4net>
Lines changed: 20 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,22 @@
1-
<?xml version="1.0" encoding="utf-8" ?>
1+
<?xml version="1.0" encoding="utf-8"?>
2+
23
<log4net>
3-
<appender name="RollingFileAppender" type="log4net.Appender.RollingFileAppender" >
4-
<file value="App_Data/Logs/Logs.txt" />
5-
<appendToFile value="true" />
6-
<rollingStyle value="Size" />
7-
<maxSizeRollBackups value="10" />
8-
<maximumFileSize value="10000KB" />
9-
<staticLogFileName value="true" />
10-
<layout type="log4net.Layout.PatternLayout">
11-
<conversionPattern value="%-5level %date [%-5.5thread] %-40.40logger - %message%newline" />
12-
</layout>
13-
</appender>
14-
<root>
15-
<appender-ref ref="RollingFileAppender" />
16-
<level value="DEBUG" />
17-
</root>
18-
<logger name="NHibernate">
19-
<level value="WARN" />
20-
</logger>
4+
<appender name="RollingFileAppender" type="log4net.Appender.RollingFileAppender">
5+
<file value="App_Data/Logs/Logs.txt" />
6+
<appendToFile value="true" />
7+
<rollingStyle value="Size" />
8+
<maxSizeRollBackups value="10" />
9+
<maximumFileSize value="10000KB" />
10+
<staticLogFileName value="true" />
11+
<layout type="log4net.Layout.PatternLayout">
12+
<conversionPattern value="%-5level %date [%-5.5thread] %-40.40logger - %message%newline" />
13+
</layout>
14+
</appender>
15+
<root>
16+
<appender-ref ref="RollingFileAppender" />
17+
<level value="DEBUG" />
18+
</root>
19+
<logger name="NHibernate">
20+
<level value="WARN" />
21+
</logger>
2122
</log4net>

0 commit comments

Comments
 (0)