From 239f12cdc175a4d79790cc84e435a681697db069 Mon Sep 17 00:00:00 2001 From: Li Date: Sun, 27 Nov 2022 11:29:04 +1300 Subject: [PATCH] Fix datetime format in HISPd --- HorseIsleServer/HISPd/Program.cs | 13 ++++++------- HorseIsleServer/HISPd/Properties/AssemblyInfo.cs | 4 ++-- HorseIsleServer/HISPd/Resources/DEBIAN/control | 2 +- HorseIsleServer/LibHISP/Properties/AssemblyInfo.cs | 4 ++-- HorseIsleServer/MPN00BS/Properties/AssemblyInfo.cs | 4 ++-- 5 files changed, 13 insertions(+), 14 deletions(-) diff --git a/HorseIsleServer/HISPd/Program.cs b/HorseIsleServer/HISPd/Program.cs index b6346e2..2f5ca20 100755 --- a/HorseIsleServer/HISPd/Program.cs +++ b/HorseIsleServer/HISPd/Program.cs @@ -74,7 +74,7 @@ namespace HISP.Cli shutdownHandle.Set(); } - private static string formatMessage(string type, string text) + private static string formatMessage(string type, string text, bool console) { #if OS_WINDOWS string newline = "\r\n"; @@ -82,9 +82,8 @@ namespace HISP.Cli string newline = "\n"; #endif - string msg = DateTime.Now.ToString("MM dd yyyy HH:mm:dd") + ": [" + type + "] "; - - if (text.Length > (Console.WindowWidth - msg.Length) - newline.Length) + string msg = DateTime.Now.ToString("MM-dd-yyyy HH:mm:ss") + ": [" + type + "] "; + if (console && text.Length > (Console.WindowWidth - msg.Length) - newline.Length) text = text.Substring(0, (Console.WindowWidth - msg.Length) - newline.Length); return msg + text + newline; @@ -92,7 +91,7 @@ namespace HISP.Cli public static void LogToFile(bool error, string type,string text) { - sw.WriteLine(formatMessage(type, text)); + sw.WriteLine(formatMessage(type, text, false)); if (error) sw.Flush(); } @@ -103,9 +102,9 @@ namespace HISP.Cli try { if (error) - Console.Error.WriteAsync(formatMessage(type, text)); + Console.Error.WriteAsync(formatMessage(type, text, true)); else - Console.Out.WriteAsync(formatMessage(type, text)); + Console.Out.WriteAsync(formatMessage(type, text, true)); } catch (Exception) { }; diff --git a/HorseIsleServer/HISPd/Properties/AssemblyInfo.cs b/HorseIsleServer/HISPd/Properties/AssemblyInfo.cs index c302400..2caff73 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.61.0")] -[assembly: AssemblyFileVersion("1.8.61.0")] +[assembly: AssemblyVersion("1.8.62.0")] +[assembly: AssemblyFileVersion("1.8.62.0")] diff --git a/HorseIsleServer/HISPd/Resources/DEBIAN/control b/HorseIsleServer/HISPd/Resources/DEBIAN/control index cf45cff..a4e8282 100755 --- a/HorseIsleServer/HISPd/Resources/DEBIAN/control +++ b/HorseIsleServer/HISPd/Resources/DEBIAN/control @@ -1,5 +1,5 @@ Package: hisp -Version: 1.8.61 +Version: 1.8.62 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 9a754f0..21053af 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.61.0")] -[assembly: AssemblyFileVersion("1.8.61.0")] +[assembly: AssemblyVersion("1.8.62.0")] +[assembly: AssemblyFileVersion("1.8.62.0")] diff --git a/HorseIsleServer/MPN00BS/Properties/AssemblyInfo.cs b/HorseIsleServer/MPN00BS/Properties/AssemblyInfo.cs index 7c289eb..ab4c0e1 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.61.0")] -[assembly: AssemblyFileVersion("1.8.61.0")] +[assembly: AssemblyVersion("1.8.62.0")] +[assembly: AssemblyFileVersion("1.8.62.0")]