From 2c1fee746fc626ff51ea3ac66865bab8f9020776 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=9B=BD=E4=BC=9F?= <366193849@qq.com>
Date: Fri, 17 Sep 2021 11:20:39 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 FastGithub.DomainResolve/DnscryptProxyHostedService.cs    | 2 --
 FastGithub.ReverseProxy/KestrelServerOptionsExtensions.cs | 8 ++++----
 .../{VersonHostedService.cs => AppHostedService.cs}       | 7 ++++---
 FastGithub/Program.cs                                     | 1 -
 FastGithub/Startup.cs                                     | 2 +-
 5 files changed, 9 insertions(+), 11 deletions(-)
 rename FastGithub/{VersonHostedService.cs => AppHostedService.cs} (73%)

diff --git a/FastGithub.DomainResolve/DnscryptProxyHostedService.cs b/FastGithub.DomainResolve/DnscryptProxyHostedService.cs
index 5ddd071..bdbba35 100644
--- a/FastGithub.DomainResolve/DnscryptProxyHostedService.cs
+++ b/FastGithub.DomainResolve/DnscryptProxyHostedService.cs
@@ -37,7 +37,6 @@ namespace FastGithub.DomainResolve
             try
             {
                 await this.dnscryptProxy.StartAsync(cancellationToken);
-                this.logger.LogInformation($"已监听dns://{this.dnscryptProxy.LocalEndPoint}，{this.dnscryptProxy}启动完成");
             }
             catch (Exception ex)
             {
@@ -55,7 +54,6 @@ namespace FastGithub.DomainResolve
             try
             {
                 this.dnscryptProxy.Stop();
-                this.logger.LogInformation($"{this.dnscryptProxy}已停止");
             }
             catch (Exception ex)
             {
diff --git a/FastGithub.ReverseProxy/KestrelServerOptionsExtensions.cs b/FastGithub.ReverseProxy/KestrelServerOptionsExtensions.cs
index 94ab00e..78daefb 100644
--- a/FastGithub.ReverseProxy/KestrelServerOptionsExtensions.cs
+++ b/FastGithub.ReverseProxy/KestrelServerOptionsExtensions.cs
@@ -41,7 +41,7 @@ namespace FastGithub
 
             var logger = kestrel.GetLogger();
             kestrel.Listen(IPAddress.Loopback, httpProxyPort);
-            logger.LogInformation($"已监听http://127.0.0.1:{httpProxyPort}，http代理启动完成");
+            logger.LogInformation($"已监听http://127.0.0.1:{httpProxyPort}，http代理服务启动完成");
         }
 
         /// <summary>
@@ -54,7 +54,7 @@ namespace FastGithub
             if (LocalMachine.CanListenTcp(SSH_PORT) == true)
             {
                 kestrel.Listen(IPAddress.Loopback, SSH_PORT, listen => listen.UseConnectionHandler<SshReverseProxyHandler>());
-                kestrel.GetLogger().LogInformation($"已监听ssh://127.0.0.1:{SSH_PORT}，ssh反向代理到github启动完成");
+                kestrel.GetLogger().LogInformation($"已监听ssh://127.0.0.1:{SSH_PORT}，github的ssh反向代理服务启动完成");
             }
         }
 
@@ -68,7 +68,7 @@ namespace FastGithub
             if (LocalMachine.CanListenTcp(HTTP_PORT) == true)
             {
                 kestrel.Listen(IPAddress.Loopback, HTTP_PORT);
-                kestrel.GetLogger().LogInformation($"已监听http://127.0.0.1:{HTTP_PORT}，http反向代理启动完成");
+                kestrel.GetLogger().LogInformation($"已监听http://127.0.0.1:{HTTP_PORT}，http反向代理服务启动完成");
             }
         }
 
@@ -103,7 +103,7 @@ namespace FastGithub
             if (httpsPort == 443)
             {
                 var logger = kestrel.GetLogger();
-                logger.LogInformation($"已监听https://127.0.0.1:{httpsPort}，https反向代理启动完成");
+                logger.LogInformation($"已监听https://127.0.0.1:{httpsPort}，https反向代理服务启动完成");
             }
 
             return httpsPort;
diff --git a/FastGithub/VersonHostedService.cs b/FastGithub/AppHostedService.cs
similarity index 73%
rename from FastGithub/VersonHostedService.cs
rename to FastGithub/AppHostedService.cs
index 4c5f907..eb5e8ea 100644
--- a/FastGithub/VersonHostedService.cs
+++ b/FastGithub/AppHostedService.cs
@@ -5,11 +5,11 @@ using System.Threading.Tasks;
 
 namespace FastGithub
 {
-    sealed class VersonHostedService : IHostedService
+    sealed class AppHostedService : IHostedService
     {
-        private readonly ILogger<VersonHostedService> logger;
+        private readonly ILogger<AppHostedService> logger;
 
-        public VersonHostedService(ILogger<VersonHostedService> logger)
+        public AppHostedService(ILogger<AppHostedService> logger)
         {
             this.logger = logger;
         }
@@ -23,6 +23,7 @@ namespace FastGithub
 
         public Task StopAsync(CancellationToken cancellationToken)
         {
+            this.logger.LogInformation($"{nameof(FastGithub)}止停止运行");
             return Task.CompletedTask;
         }
     }
diff --git a/FastGithub/Program.cs b/FastGithub/Program.cs
index 62d7a22..d28c380 100644
--- a/FastGithub/Program.cs
+++ b/FastGithub/Program.cs
@@ -48,7 +48,6 @@ namespace FastGithub
                 .ConfigureWebHostDefaults(webBuilder =>
                 {
                     webBuilder.UseStartup<Startup>();
-                    webBuilder.UseShutdownTimeout(TimeSpan.FromSeconds(2d));
                     webBuilder.UseKestrel(kestrel =>
                     {
                         kestrel.NoLimit();
diff --git a/FastGithub/Startup.cs b/FastGithub/Startup.cs
index c83c781..008b0f4 100644
--- a/FastGithub/Startup.cs
+++ b/FastGithub/Startup.cs
@@ -35,7 +35,7 @@ namespace FastGithub
             services.AddDomainResolve();
             services.AddHttpClient();
             services.AddReverseProxy();
-            services.AddHostedService<VersonHostedService>();
+            services.AddHostedService<AppHostedService>();
 
             if (OperatingSystem.IsWindows())
             {