Merge branch 'develop2' into master

yar229 · Jan 20, 2021 · 9e02f6d · 9e02f6d
2 parents 668649a + 1ab1a91
commit 9e02f6d
Show file tree

Hide file tree

Showing 4 changed files with 53 additions and 4 deletions.
diff --git a/MailRuCloud/MailRuCloudApi/SmtpAsyncAppender.cs b/MailRuCloud/MailRuCloudApi/SmtpAsyncAppender.cs
@@ -0,0 +1,27 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Threading.Tasks;
+using log4net.Appender;
+
+namespace YaR.Clouds
+{
+    public class SmtpAsyncAppender : SmtpAppender
+    {
+        protected override void SendEmail(string messageBody)
+        {
+            Task.Run(() =>
+            {
+                try
+                {
+                    base.SendEmail(messageBody);
+                }
+                catch (Exception e)
+                {
+                    Console.WriteLine(e);
+                    throw;
+                }
+            });
+        }
+    }
+}
diff --git a/MailRuCloud/MailRuCloudApi/YaR.Clouds.csproj b/MailRuCloud/MailRuCloudApi/YaR.Clouds.csproj
@@ -7,8 +7,8 @@
     <TargetFrameworks>$(CommonTargetFrameworks)</TargetFrameworks>
     <RootNamespace>YaR.Clouds</RootNamespace>
     <AssemblyName>YaR.Clouds</AssemblyName>
-    <AssemblyVersion>1.13.1.2</AssemblyVersion>
-    <FileVersion>1.13.1.2</FileVersion>
+    <AssemblyVersion>1.13.2.0</AssemblyVersion>
+    <FileVersion>1.13.2.0</FileVersion>
     <Version>$(AssemblyVersion)</Version>
     <LangVersion>preview</LangVersion>
   </PropertyGroup>

diff --git a/WDMRC.Console/WDMRC.Console.csproj b/WDMRC.Console/WDMRC.Console.csproj
@@ -15,8 +15,8 @@
     <Copyright>[email protected]</Copyright>
     <Description>WebDAV emulator for Cloud.mail.ru</Description>
     <PackageId>WebDAVCloudMailRu</PackageId>
-    <AssemblyVersion>1.13.1.2</AssemblyVersion>
-    <FileVersion>1.13.1.2</FileVersion>
+    <AssemblyVersion>1.13.2.0</AssemblyVersion>
+    <FileVersion>1.13.2.0</FileVersion>
     <Version>$(AssemblyVersion)</Version>
     <AssemblyName>wdmrc</AssemblyName>
     <RootNamespace>YaR.Clouds.Console</RootNamespace>

diff --git a/WDMRC.Console/wdmrc.config b/WDMRC.Console/wdmrc.config
@@ -40,10 +40,32 @@
       </layout>      
     </appender>
 
+    <appender name="SmtpAsyncAppender" type="YaR.Clouds.SmtpAsyncAppender">
+      <to value="[email protected]" />
+      <from value="[email protected]" />
+      <subject value="WDMRC error" />
+      <smtpHost value="smtp.yandex.ru" />
+      <authentication value="Basic" />
+      <port value="587" />
+      <username value="[email protected]" />
+      <password value="my_application_password" />
+      <bufferSize value="1" />
+      <EnableSsl value="true"/>
+      <lossy value="true" />
+      <threshold value="ERROR" />
+      <evaluator type="log4net.Core.LevelEvaluator">
+        <threshold value="WARN"/>
+      </evaluator>
+      <layout type="log4net.Layout.PatternLayout">
+        <conversionPattern value="%date{dd/MM/yyyy hh:mm:ss.fff}&#9;%-5level&#9;%-15logger&#9;%message%newline" />
+      </layout>
+    </appender>
+
     <root>
       <level value="ALL"/>
       <appender-ref ref="ColoredConsoleAppender"/>
       <!-- <appender-ref ref="RollingLogFileAppender"/>  -->
+      <!-- <appender-ref ref="SmtpAsyncAppender"/>  -->
     </root>
   </log4net>