Merge branch 'develop'

yar229 · Mar 21, 2017 · c1a81b6 · c1a81b6
2 parents 2677054 + 48b313a
commit c1a81b6
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/WDMRC.Console/Program.cs b/WDMRC.Console/Program.cs
@@ -53,13 +53,13 @@ static void Main(string[] args)
                         httpListener.AuthenticationSchemes = AuthenticationSchemes.Basic;
                         httpListener.Start();
 
-                        // Start dispatching requests
-                        DispatchHttpRequestsAsync(httpListener, cancellationTokenSource.Token, options.MaxThreadCount);
-
-                        // Wait until somebody presses return
                         Logger.Info($"WebDAV server running at {webdavHost}:{webdavPort}");
-                        while (Console.ReadKey().KeyChar != 'x') {}
 
+                        // Start dispatching requests
+                        var t =  DispatchHttpRequestsAsync(httpListener, cancellationTokenSource.Token, options.MaxThreadCount);
+                        t.Wait(cancellationTokenSource.Token);
+
+                        //do not use console input - it uses 100% CPU when running mono-service in ubuntu
                     }
                     finally
                     {
@@ -75,7 +75,7 @@ static void Main(string[] args)
         }
 
 
-        private static async void DispatchHttpRequestsAsync(HttpListener httpListener, CancellationToken cancellationToken, int maxThreadCount = Int32.MaxValue)
+        private static async Task DispatchHttpRequestsAsync(HttpListener httpListener, CancellationToken cancellationToken, int maxThreadCount = Int32.MaxValue)
         {
             // Create a request handler factory that uses basic authentication
             var requestHandlerFactory = new CloudStore.Mailru.RequestHandlerFactory();

diff --git a/WDMRC.Console/Properties/AssemblyInfo.cs b/WDMRC.Console/Properties/AssemblyInfo.cs
@@ -31,8 +31,8 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.5.62.0")]
-[assembly: AssemblyFileVersion("1.5.62.0")]
+[assembly: AssemblyVersion("1.5.63.0")]
+[assembly: AssemblyFileVersion("1.5.63.0")]
 
 
 [assembly: log4net.Config.XmlConfigurator(Watch = true)]