Merge pull request #7 from yar229/develop

mutiple connections allowed
yar229 · Nov 15, 2016 · b263a32 · b263a32
2 parents 438d186 + 096b074
commit b263a32
Show file tree

Hide file tree

Showing 4 changed files with 58 additions and 61 deletions.
diff --git a/WDMRC.Console/App.config b/WDMRC.Console/App.config
@@ -1,28 +1,58 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
-
 
+  <configSections>
+
+    <sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+      <section name="FooConsole.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
+    </sectionGroup>
 
+    <sectionGroup name="common">
+      <section name="logging" type="Common.Logging.ConfigurationSectionHandler, Common.Logging" />
+    </sectionGroup>
 
-    <configSections>
-
-        <sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-            <section name="FooConsole.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
-        </sectionGroup>
-
-        <sectionGroup name="common">
-          <section name="logging" type="Common.Logging.ConfigurationSectionHandler, Common.Logging" />
-        </sectionGroup>      
-
-        <section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler, log4net" />
-
-    </configSections>
+    <section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler, log4net"/>
+
+  </configSections>
 
     <startup> 
         <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
     </startup>
-
-    <applicationSettings>
+
+
+  <log4net>
+    <!-- Define the logfile appender -->
+    <appender name="ColoredConsoleAppender" type="log4net.Appender.ColoredConsoleAppender">
+      <mapping>
+        <level value="ERROR"/>
+        <foreColor value="Red, HighIntensity"/>
+      </mapping>
+      <mapping>
+        <level value="WARN"/>
+        <foreColor value="Red"/>
+      </mapping>
+      <mapping>
+        <level value="INFO"/>
+        <foreColor value="White"/>
+      </mapping>
+      <mapping>
+        <level value="DEBUG"/>
+        <foreColor value="Green"/>
+      </mapping>
+      <layout type="log4net.Layout.PatternLayout">
+        <conversionPattern value="[%thread]: %message%newline"/>
+      </layout>
+    </appender>
+
+    <root>
+      <level value="DEBUG"/>
+      <appender-ref ref="ColoredConsoleAppender"/>
+    </root>
+
+  </log4net>
+
+
+  <applicationSettings>
         <FooConsole.Properties.Settings>
             <setting name="z" serializeAs="String">
                 <value>z</value>
@@ -44,49 +74,7 @@
     </logging>
   </common>  
 
-  <log4net debug="true">
-    <appender name="RollingLogFileAppenderOutput" type="log4net.Appender.RollingFileAppender">
-      <encoding value="utf-8" />
-      <staticLogFileName value="false" />
-      <lockingModel type="log4net.Appender.FileAppender+MinimalLock" />
-      <file value=".\Logs\TelegramBot-" />
-      <appendToFile value="true" />
-      <rollingStyle value="Date" />
-      <datePattern value="yyyy-MM-dd'.log'" />
-      <layout type="log4net.Layout.PatternLayout">
-        <conversionPattern value="%date [%thread] [%class] %-5level - %message%newline" />
-      </layout>
-    </appender>
-    <appender name="uHttpRollingLogFileAppenderOutput" type="log4net.Appender.RollingFileAppender">
-      <encoding value="utf-8" />
-      <staticLogFileName value="false" />
-      <lockingModel type="log4net.Appender.FileAppender+MinimalLock" />
-      <file value=".\Logs\TelegramBot-uhttp-" />
-      <appendToFile value="true" />
-      <rollingStyle value="Date" />
-      <datePattern value="yyyy-MM-dd'.log'" />
-      <layout type="log4net.Layout.PatternLayout">
-        <conversionPattern value="%date [%thread] [%class] %-5level - %message%newline" />
-      </layout>
-    </appender>
-    <appender name="ConsoleAppender" type="log4net.Appender.ConsoleAppender">
-      <target value="Console.Error" />
-      <layout type="log4net.Layout.PatternLayout">
-        <conversionPattern value="%date [%thread] [%class] %-5level - %message%newline" />
-      </layout>
-    </appender>
-    <root>
-      <level value="ALL" />
-      <appender-ref ref="ConsoleAppender" />
-    </root>
-
-    <logger name="WebDavServer">
-      <level value="DEBUG" />
-      <appender-ref ref="ConsoleAppender" />
-    </logger>
-
-  </log4net>
-
+
 
   <runtime>
 

diff --git a/WDMRC.Console/Program.cs b/WDMRC.Console/Program.cs
@@ -6,16 +6,19 @@
 using NWebDav.Server.Handlers;
 using NWebDav.Server.Http;
 using NWebDav.Server.HttpListener;
-using NWebDav.Server.Stores;
 using WebDavMailRuCloudStore;
 using YaR.WebDavMailRu.CloudStore;
 
 namespace YaR.WebDavMailRu
 {
     static class Program
     {
+        //private static readonly ILog Log = LogManager.GetLogger<Parser>();
+
         static void Main(string[] args)
         {
+            //Log.Info("asdasdadasdasd");
+
             var result = Parser.Default.ParseArguments<CommandLineOptions>(args);
 
             var exitCode = result
@@ -94,7 +97,8 @@ private static async void DispatchHttpRequestsAsync(System.Net.HttpListener http
                     httpContext = new HttpContext(httpListenerContext);
 
                 // Dispatch the request
-                await webDavDispatcher.DispatchRequestAsync(httpContext).ConfigureAwait(false);
+                //await webDavDispatcher.DispatchRequestAsync(httpContext).ConfigureAwait(false);
+                webDavDispatcher.DispatchRequestAsync(httpContext).ConfigureAwait(false);
             }
         }
     }

diff --git a/WebDavMailRuCloudStore/WebDavMailRuCloudStore.csproj b/WebDavMailRuCloudStore/WebDavMailRuCloudStore.csproj
@@ -39,6 +39,10 @@
       <HintPath>..\packages\Common.Logging.Core.3.4.0-Beta2\lib\net40\Common.Logging.Core.dll</HintPath>
       <Private>True</Private>
     </Reference>
+    <Reference Include="log4net, Version=1.2.15.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
+      <HintPath>..\packages\log4net.2.0.5\lib\net45-full\log4net.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="NWebDav.Server, Version=0.1.17.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\NWebDav.Server.0.1.17.0\lib\net45\NWebDav.Server.dll</HintPath>
       <Private>True</Private>

diff --git a/WebDavMailRuCloudStore/packages.config b/WebDavMailRuCloudStore/packages.config
@@ -2,6 +2,7 @@
 <packages>
   <package id="Common.Logging" version="3.4.0-Beta2" targetFramework="net45" />
   <package id="Common.Logging.Core" version="3.4.0-Beta2" targetFramework="net45" />
+  <package id="log4net" version="2.0.5" targetFramework="net45" />
   <package id="Microsoft.CSharp" version="4.3.0-preview1-24530-04" targetFramework="net45" />
   <package id="NWebDav.Server" version="0.1.17.0" targetFramework="net45" />
 </packages>