Merge branch 'develop2'

yar229 · Feb 21, 2018 · 900dfcb · 900dfcb
2 parents 84c49dc + 11c6278
commit 900dfcb
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 19 deletions.
diff --git a/MailRuCloud/MailRuCloudApi/MailRuCloudApi.csproj b/MailRuCloud/MailRuCloudApi/MailRuCloudApi.csproj
@@ -5,8 +5,8 @@
     <TargetFrameworks>netcoreapp2.0;net452</TargetFrameworks>
     <RootNamespace>YaR.MailRuCloud.Api</RootNamespace>
     <AssemblyName>MailRuCloud.Api</AssemblyName>
-    <AssemblyVersion>1.10.1.10</AssemblyVersion>
-    <FileVersion>1.10.1.10</FileVersion>
+    <AssemblyVersion>1.10.1.11</AssemblyVersion>
+    <FileVersion>1.10.1.11</FileVersion>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/WDMRC.Console/Payload.cs b/WDMRC.Console/Payload.cs
@@ -51,21 +51,26 @@ public static void Run(CommandLineOptions options)
 
             var httpListener = new HttpListener();
             var httpListenerOptions = new HttpListenerOptions(options);
-            try
-            {
-                foreach (var prefix in httpListenerOptions.Prefixes)
-                    httpListener.Prefixes.Add(prefix);
-                httpListener.AuthenticationSchemes = httpListenerOptions.AuthenticationScheme;
-                httpListener.Start();
-
-                Logger.Info($"WebDAV server running at {httpListenerOptions.Prefixes.Aggregate((current, next) => current + ", " + next)}");
-
-                // Start dispatching requests
-                var t = DispatchHttpRequestsAsync(httpListener, options.MaxThreadCount);
-                t.Wait(CancelToken.Token);
-
-                //do not use console input - it uses 100% CPU when running mono-service in ubuntu
-            }
+	        try
+	        {
+		        foreach (var prefix in httpListenerOptions.Prefixes)
+			        httpListener.Prefixes.Add(prefix);
+		        httpListener.AuthenticationSchemes = httpListenerOptions.AuthenticationScheme;
+		        httpListener.Start();
+
+		        Logger.Info(
+			        $"WebDAV server running at {httpListenerOptions.Prefixes.Aggregate((current, next) => current + ", " + next)}");
+
+		        // Start dispatching requests
+		        var t = DispatchHttpRequestsAsync(httpListener, options.MaxThreadCount);
+		        t.Wait(CancelToken.Token);
+
+		        //do not use console input - it uses 100% CPU when running mono-service in ubuntu
+	        }
+	        catch (OperationCanceledException ce) when (ce.CancellationToken.IsCancellationRequested)
+	        {
+		        Logger.Info("Cancelled");
+	        }
             finally
             {
                 httpListener.Stop();

diff --git a/WDMRC.Console/WDMRC.Console.csproj b/WDMRC.Console/WDMRC.Console.csproj
@@ -11,8 +11,8 @@
     <Copyright>[email protected]</Copyright>
     <Description>WebDAV emulator for Cloud.mail.ru</Description>
     <PackageId>WebDAVCloudMailRu</PackageId>
-    <AssemblyVersion>1.10.1.10</AssemblyVersion>
-    <FileVersion>1.10.1.10</FileVersion>
+    <AssemblyVersion>1.10.1.11</AssemblyVersion>
+    <FileVersion>1.10.1.11</FileVersion>
     <AssemblyName>wdmrc</AssemblyName>
     <RootNamespace>YaR.CloudMailRu.Console</RootNamespace>
     <StartupObject></StartupObject>