Add logging

DigitalRuby · Mar 28, 2012 · b282923 · b282923
1 parent c0d492b
commit b282923
Show file tree

Hide file tree

Showing 23 changed files with 89,037 additions and 8 deletions.
diff --git a/IPBan.csproj b/IPBan.csproj
@@ -36,6 +36,9 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="NLog">
+      <HintPath>packages\NLog.2.0.0.2000\lib\net40\NLog.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.configuration" />
     <Reference Include="System.Core" />
@@ -54,12 +57,14 @@
     <Compile Include="IPBanService.cs">
       <SubType>Component</SubType>
     </Compile>
+    <Compile Include="Logger.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="app.config">
       <SubType>Designer</SubType>
     </None>
+    <None Include="packages.config" />
     <None Include="README" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

diff --git a/IPBanService.cs b/IPBanService.cs
@@ -104,7 +104,7 @@ private void ClearBannedIP()
 
         private void ProcessXml(string xml)
         {
-            Console.WriteLine("Processing xml: {0}", xml);
+            Log.Write(LogLevel.Info, "Processing xml: {0}", xml);
 
             string ipAddress = null;
             XmlTextReader reader = new XmlTextReader(new StringReader(xml));
@@ -125,15 +125,15 @@ private void ProcessXml(string xml)
 
                         if (nodes.Count == 0)
                         {
-                            Console.WriteLine("No nodes found for xpath {0}", expression.XPath);
+                            Log.Write(LogLevel.Warning, "No nodes found for xpath {0}", expression.XPath);
                             ipAddress = null;
                             break;
                         }
 
                         // if there is a regex, it must match
                         if (expression.Regex.Length == 0)
                         {
-                            Console.WriteLine("No regex, so counting as a match");
+                            Log.Write(LogLevel.Info, "No regex, so counting as a match");
                         }
                         else
                         {
@@ -159,7 +159,7 @@ private void ProcessXml(string xml)
 
                             if (!foundMatch)
                             {
-                                Console.WriteLine("Regex {0} did not match any nodes with xpath {1}", expression.Regex, expression.XPath);
+                                Log.Write(LogLevel.Warning, "Regex {0} did not match any nodes with xpath {1}", expression.Regex, expression.XPath);
                                 ipAddress = null;
                                 break;
                             }
@@ -191,10 +191,10 @@ private void ProcessXml(string xml)
                         ipBlocker.TryGetValue(ipAddress, out count);
                         count++;
                         ipBlocker[ipAddress] = count;
-                        Console.WriteLine("Got event with ip address {0}, count: {1}", ipAddress, count);
+                        Log.Write(LogLevel.Info, "Got event with ip address {0}, count: {1}", ipAddress, count);
                         if (count == failedLoginAttemptsBeforeBan)
                         {
-                            Console.WriteLine("Banning ip address {0}", ipAddress);
+                            Log.Write(LogLevel.Error, "Banning ip address {0}", ipAddress);
                             Process.Start("netsh", "advfirewall firewall add rule \"name=" + rulePrefix + ipAddress + "\" dir=in protocol=any action=block remoteip=" + ipAddress);
                             File.AppendAllText(banFile, ipAddress + Environment.NewLine);
                             ipBlockerDate[ipAddress] = DateTime.UtcNow;
@@ -203,7 +203,7 @@ private void ProcessXml(string xml)
                 }
                 else
                 {
-                    Console.WriteLine("Skipping ip address '{0}'", ipAddress);
+                    Log.Write(LogLevel.Info, "Skipping ip address '{0}'", ipAddress);
                 }
             }
         }
@@ -337,7 +337,7 @@ private void CheckForExpiredIP()
 
                 if (elapsed.Days > 0)
                 {
-                    Console.WriteLine("Un-banning ip address {0}", keyValue.Key);
+                    Log.Write(LogLevel.Error, "Un-banning ip address {0}", keyValue.Key);
                     Process.Start("netsh", "advfirewall firewall delete rule \"name=" + rulePrefix + keyValue.Key + "\"");
                     lock (ipBlocker)
                     {
@@ -379,6 +379,7 @@ protected override void OnStart(string[] args)
         {
             base.OnStart(args);
 
+            Log.Write(LogLevel.Info, "Started IPBan service");
             run = true;
             serviceThread = new Thread(new ThreadStart(ServiceThread));
             serviceThread.Start();
@@ -391,6 +392,8 @@ protected override void OnStop()
             run = false;
             query = null;
             watcher = null;
+
+            Log.Write(LogLevel.Info, "Stopped IPBan service");
         }
 
         public static void RunService(string[] args)
@@ -411,6 +414,8 @@ public static void RunConsole(string[] args)
 
         public static void Main(string[] args)
         {
+            Directory.SetCurrentDirectory(AppDomain.CurrentDomain.BaseDirectory);
+
             if (args.Length != 0 && args[0] == "debug")
             {
                 RunConsole(args);

diff --git a/Logger.cs b/Logger.cs
@@ -0,0 +1,42 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+using NLog;
+
+namespace IPBan
+{
+    public enum LogLevel
+    {
+        Info,
+        Warning,
+        Error
+    }
+
+    /// <summary>
+    /// Logger
+    /// </summary>
+    public static class Log
+    {
+        private static readonly Logger logger = LogManager.GetLogger("FileLogger");
+
+        public static void Write(LogLevel level, string text, params object[] args)
+        {
+            switch (level)
+            {
+                case LogLevel.Info:
+                    logger.Info(text, args);
+                    break;
+
+                case LogLevel.Warning:
+                    logger.Warn(text, args);
+                    break;
+
+                case LogLevel.Error:
+                    logger.Error(text, args);
+                    break;
+            }
+        }
+    }
+}
diff --git a/app.config b/app.config
@@ -2,6 +2,7 @@
 <configuration>
   <configSections>
     <section name="ExpressionsToBlock" type="IPBan.ExpressionsToBlockConfigSectionHandler, IPBan" />
+    <section name="nlog" type="NLog.Config.ConfigSectionHandler, NLog"/>
   </configSections>
 
   <!--
@@ -47,6 +48,17 @@
       </Group>
     </Groups>
   </ExpressionsToBlock>
+
+  <nlog xmlns="http://www.nlog-project.org/schemas/NLog.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+    <targets>
+      <target name="logfile" xsi:type="File" fileName="logfile.txt"/>
+      <target name="console" xsi:type="Console" />
+    </targets>
+    <rules>
+      <logger name="*" minlevel="Info" writeTo="logfile" />
+      <logger name="*" minlevel="Info" writeTo="console" />
+    </rules>
+  </nlog>
 
   <appSettings>
 

diff --git a/packages.config b/packages.config
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="NLog" version="2.0.0.2000" />
+</packages>
diff --git a/packages/NLog.2.0.0.2000/NLog.2.0.0.2000.nupkg b/packages/NLog.2.0.0.2000/NLog.2.0.0.2000.nupkg
diff --git a/packages/NLog.2.0.0.2000/lib/net20/NLog.dll b/packages/NLog.2.0.0.2000/lib/net20/NLog.dll