From e9fdf1ff6fce3d4e3878877e8b76d082f7b14863 Mon Sep 17 00:00:00 2001 From: Li Date: Fri, 11 Nov 2022 19:07:07 +1300 Subject: [PATCH] Try fix crash handler --- HorseIsleServer/HISPd/Program.cs | 20 ++++++++++++++----- .../HISPd/Properties/AssemblyInfo.cs | 4 ++-- .../Properties/PublishProfiles/Win64.pubxml | 5 +---- .../HISPd/Resources/DEBIAN/control | 2 +- .../LibHISP/Properties/AssemblyInfo.cs | 4 ++-- .../MPN00BS/Properties/AssemblyInfo.cs | 4 ++-- 6 files changed, 23 insertions(+), 16 deletions(-) diff --git a/HorseIsleServer/HISPd/Program.cs b/HorseIsleServer/HISPd/Program.cs index fb7e67b..a0b507c 100755 --- a/HorseIsleServer/HISPd/Program.cs +++ b/HorseIsleServer/HISPd/Program.cs @@ -1,5 +1,4 @@ -using HISP.Cli.Properties; -using HISP.Server; +using HISP.Server; using System; using System.IO; using System.Threading; @@ -44,11 +43,22 @@ namespace HISP.Cli public static void OnShutdown() { + if(fs != null) + { + fs.Close(); + fs.Dispose(); + } + if(sw != null) + { + sw.Close(); + sw.Dispose(); + } + shutdownHandle.Set(); } public static void LogToFile(bool error, string type,string text) { - sw.WriteLineAsync(DateTime.Now.ToString("MM-dd-YYYY HH:mm:dd") + ": [" + type + "] " + text + sw.NewLine); + sw.WriteLine(DateTime.Now.ToString("MM-dd-yyyy HH:mm:dd") + ": [" + type + "] " + text + sw.NewLine); } public static void LogStdout(bool error, string type, string text) { @@ -56,9 +66,9 @@ namespace HISP.Cli LogToFile(error, type, text); if (error) - Console.Error.WriteAsync(DateTime.Now.ToString("MM-dd-YYYY HH:mm:dd")+": [" + type + "] " + text + Console.Error.NewLine); + Console.Error.WriteAsync(DateTime.Now.ToString("MM-dd-yyyy HH:mm:dd")+": [" + type + "] " + text + Console.Error.NewLine); else - Console.Out.WriteAsync(DateTime.Now.ToString("MM-dd-YYYY HH:mm:dd") + ": [" + type + "] " + text + Console.Out.NewLine); + Console.Out.WriteAsync(DateTime.Now.ToString("MM-dd-yyyy HH:mm:dd") + ": [" + type + "] " + text + Console.Out.NewLine); } diff --git a/HorseIsleServer/HISPd/Properties/AssemblyInfo.cs b/HorseIsleServer/HISPd/Properties/AssemblyInfo.cs index fac2747..fe2f6ee 100755 --- a/HorseIsleServer/HISPd/Properties/AssemblyInfo.cs +++ b/HorseIsleServer/HISPd/Properties/AssemblyInfo.cs @@ -31,5 +31,5 @@ using System.Runtime.InteropServices; // 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.8.22.0")] -[assembly: AssemblyFileVersion("1.8.22.0")] +[assembly: AssemblyVersion("1.8.23.0")] +[assembly: AssemblyFileVersion("1.8.23.0")] diff --git a/HorseIsleServer/HISPd/Properties/PublishProfiles/Win64.pubxml b/HorseIsleServer/HISPd/Properties/PublishProfiles/Win64.pubxml index 44593aa..4d554ad 100755 --- a/HorseIsleServer/HISPd/Properties/PublishProfiles/Win64.pubxml +++ b/HorseIsleServer/HISPd/Properties/PublishProfiles/Win64.pubxml @@ -11,12 +11,9 @@ https://go.microsoft.com/fwlink/?LinkID=208121. net7.0 win-x64 True + True True True - - True - - OS_WINDOWS;ARCH_X86_64 \ No newline at end of file diff --git a/HorseIsleServer/HISPd/Resources/DEBIAN/control b/HorseIsleServer/HISPd/Resources/DEBIAN/control index 6a0afa9..0884fd4 100755 --- a/HorseIsleServer/HISPd/Resources/DEBIAN/control +++ b/HorseIsleServer/HISPd/Resources/DEBIAN/control @@ -1,5 +1,5 @@ Package: hisp -Version: 1.8.22 +Version: 1.8.23 Depends: coreutils,systemd,mariadb-server,libsqlite3-dev,zlib1g-dev,libicu-dev,libkrb5-dev Maintainer: Li Homepage: https://islehorse.com diff --git a/HorseIsleServer/LibHISP/Properties/AssemblyInfo.cs b/HorseIsleServer/LibHISP/Properties/AssemblyInfo.cs index 7e0f7a3..b9ef665 100755 --- a/HorseIsleServer/LibHISP/Properties/AssemblyInfo.cs +++ b/HorseIsleServer/LibHISP/Properties/AssemblyInfo.cs @@ -30,8 +30,8 @@ using System.Runtime.InteropServices; // // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("1.8.22.0")] -[assembly: AssemblyFileVersion("1.8.22.0")] +[assembly: AssemblyVersion("1.8.23.0")] +[assembly: AssemblyFileVersion("1.8.23.0")] diff --git a/HorseIsleServer/MPN00BS/Properties/AssemblyInfo.cs b/HorseIsleServer/MPN00BS/Properties/AssemblyInfo.cs index d4478f3..69296ef 100755 --- a/HorseIsleServer/MPN00BS/Properties/AssemblyInfo.cs +++ b/HorseIsleServer/MPN00BS/Properties/AssemblyInfo.cs @@ -30,8 +30,8 @@ using System.Runtime.InteropServices; // // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("1.8.22.0")] -[assembly: AssemblyFileVersion("1.8.22.0")] +[assembly: AssemblyVersion("1.8.23.0")] +[assembly: AssemblyFileVersion("1.8.23.0")]