[Nmailserver-commits] SF.net SVN: nmailserver: [195] NMail/trunk

[<tmy...@us...>]

Revision: 195
          http://svn.sourceforge.net/nmailserver/?rev=195&view=rev
Author:   tmyroadctfig
Date:     2007-05-12 07:17:12 -0700 (Sat, 12 May 2007)

Log Message:
-----------
Changed the logging to use a XML configuration file.

Modified Paths:
--------------
    NMail/trunk/NMail.Server.Console/NMail.Server.Console.csproj
    NMail/trunk/NMail.Server.Console/NMail.config
    NMail/trunk/NMail.Server.Console/NMailConsoleServer.cs
    NMail/trunk/NMail.Server.Service/NMailService.cs

Added Paths:
-----------
    NMail/trunk/NMail.Server.Console/logging.xml

Modified: NMail/trunk/NMail.Server.Console/NMail.Server.Console.csproj
===================================================================
--- NMail/trunk/NMail.Server.Console/NMail.Server.Console.csproj	2007-05-10 12:27:30 UTC (rev 194)
+++ NMail/trunk/NMail.Server.Console/NMail.Server.Console.csproj	2007-05-12 14:17:12 UTC (rev 195)
@@ -176,6 +176,9 @@
     <Content Include="Bounce.txt">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
+    <Content Include="logging.xml">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
     <Content Include="NMail.Server.Console.build" />
     <Content Include="Warning.txt">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>

Modified: NMail/trunk/NMail.Server.Console/NMail.config
===================================================================
--- NMail/trunk/NMail.Server.Console/NMail.config	2007-05-10 12:27:30 UTC (rev 194)
+++ NMail/trunk/NMail.Server.Console/NMail.config	2007-05-12 14:17:12 UTC (rev 195)
@@ -15,7 +15,7 @@
 		<section name="NMail.LocalStoreData.NHibernate" type="NMail.LocalStoreData.NHibernate.Configuration, NMail.LocalStoreData.NHibernate" />
 		<section name="NMail.SpoolData.NHibernate" type="NMail.SpoolData.NHibernate.Configuration, NMail.SpoolData.NHibernate" />
 	</configSections>
-
+	
 	<NMail>
 		<Services>
 			<Service Type="NMail.SmtpService.SmtpService, NMail.SmtpService" />
@@ -40,7 +40,7 @@
 	</NMail>
 
 	<NMail.Server
-		   RemoteAdminAuthorizedUsers="niknak\luke">
+		   RemoteAdminAuthorizedUsers="octerbar\luke">
 
 		<RemoteAdminClients>
 			<Client Match="127.0.0.1/32" />

Modified: NMail/trunk/NMail.Server.Console/NMailConsoleServer.cs
===================================================================
--- NMail/trunk/NMail.Server.Console/NMailConsoleServer.cs	2007-05-10 12:27:30 UTC (rev 194)
+++ NMail/trunk/NMail.Server.Console/NMailConsoleServer.cs	2007-05-12 14:17:12 UTC (rev 195)
@@ -41,7 +41,7 @@
 			Thread.CurrentThread.Name = "ServerMain";
 
 			// configure logging
-			log4net.Config.BasicConfigurator.Configure();
+			log4net.Config.XmlConfigurator.ConfigureAndWatch(new System.IO.FileInfo("logging.xml"));
             
 			try {
 				// output our platform details
@@ -61,22 +61,14 @@
 				// start the server
 				server.Start();
 
-				switch ((int) Environment.OSVersion.Platform) {
-					case 128: // detect Mono
+				switch (Environment.OSVersion.Platform) {
+					case PlatformID.Unix:
 						// drop our root privileges
 						MonoPrivileges.MonoPrivileges.SetUser(8);
 						MonoPrivileges.MonoPrivileges.SetGroup(12);
 						log.Debug("Current user id:" + MonoPrivileges.MonoPrivileges.GetUser());
 						log.Debug("Current group id:" + MonoPrivileges.MonoPrivileges.GetGroup());
 						break;
-
-					default: // Windows
-						// Change logging to file
-						log.Debug("Switching to file log...");
-						log4net.Layout.ILayout layout = new log4net.Layout.SimpleLayout();
-						log4net.Appender.IAppender appender = new log4net.Appender.FileAppender(layout, "NMail.log", true);
-						log4net.Config.BasicConfigurator.Configure(appender);
-						break;
 				}
 
 				// wait for line to be read (signalling a close)

Added: NMail/trunk/NMail.Server.Console/logging.xml
===================================================================
--- NMail/trunk/NMail.Server.Console/logging.xml	                        (rev 0)
+++ NMail/trunk/NMail.Server.Console/logging.xml	2007-05-12 14:17:12 UTC (rev 195)
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<log4net>
+	<!-- Console appender for console based servers -->
+	<appender name="ConsoleAppender" type="log4net.Appender.ConsoleAppender" >
+		<layout type="log4net.Layout.PatternLayout">
+			<conversionPattern value="%date [%thread] %-5level %logger - %message%newline" />
+		</layout>
+	</appender>
+
+	<!-- A catch-all rolling file appender -->
+	<appender name="RollingFileAppender" type="log4net.Appender.RollingFileAppender">
+		<file value="NMail.log" />
+		<appendToFile value="true" />
+		<rollingStyle value="Size" />
+		<maxSizeRollBackups value="10" />
+		<maximumFileSize value="1000KB" />
+		<staticLogFileName value="true" />
+		<layout type="log4net.Layout.PatternLayout">
+			<conversionPattern value="%date [%thread] %-5level %logger - %message%newline" />
+		</layout>
+	</appender>
+
+	<!-- A selective event log appender -->
+	<appender name="EventLogAppender" type="log4net.Appender.EventLogAppender" >
+		<applicationName value="NMail" />
+		
+		<filter type="log4net.Filter.LevelRangeFilter">
+			<levelMin value="INFO" />
+			<levelMax value="FATAL" />
+		</filter>
+		
+		<layout type="log4net.Layout.PatternLayout">
+			<conversionPattern value="%date [%thread] %-5level %logger - %message%newline" />
+		</layout>
+	</appender>
+	
+	<!-- The base logging configuration -->
+	<root>
+		<!-- <level value="INFO" /> -->
+		<appender-ref ref="ConsoleAppender" />
+		<appender-ref ref="RollingFileAppender" />
+		<appender-ref ref="EventLogAppender" />
+	</root>
+
+	<!-- Print only messages of level WARN or above in the package NHibernate -->
+	<logger name="NHibernate">
+		<level value="WARN" />
+	</logger>
+</log4net>
\ No newline at end of file

Modified: NMail/trunk/NMail.Server.Service/NMailService.cs
===================================================================
--- NMail/trunk/NMail.Server.Service/NMailService.cs	2007-05-10 12:27:30 UTC (rev 194)
+++ NMail/trunk/NMail.Server.Service/NMailService.cs	2007-05-12 14:17:12 UTC (rev 195)
@@ -40,13 +40,6 @@
 				// Change the working directory from System32 to our install directory
 				Environment.CurrentDirectory = NMailServer.GetInstallDirectory();
 
-				log.Debug("Switching to event log...");
-				log4net.Layout.ILayout layout = new log4net.Layout.SimpleLayout();
-				log4net.Appender.IAppender appender = new log4net.Appender.FileAppender(layout, "NMail.log", true);
-				//log4net.Appender.IAppender appender = new log4net.Appender.EventLogAppender(layout);
-				log4net.Config.BasicConfigurator.Configure(appender);
-				log.Debug("Now logging to event log.");
-
 				// output our platform details
 				log.Debug("NMail Console Server version: [" + Assembly.GetExecutingAssembly().GetName().Version + "]");
 				log.Debug("NMail Library version: [" + Assembly.GetAssembly(typeof(NMailConfiguration)).GetName().Version + "]");
@@ -80,7 +73,7 @@
 			Thread.CurrentThread.Name = "ServerMain";
 
 			// configure logging
-			log4net.Config.BasicConfigurator.Configure();
+			log4net.Config.XmlConfigurator.ConfigureAndWatch(new System.IO.FileInfo("logging.xml"));
 
 			ServiceBase.Run(new NMailService());
 		}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.