From 4a511dd06bed072fe544b09b20f618fec3596331 Mon Sep 17 00:00:00 2001 From: Dan Garner Date: Mon, 7 Nov 2016 13:38:04 +0000 Subject: [PATCH 1/3] Exit after unhandled exception, catch file lock on status.json and tone down prepare layout logging. --- Log/ClientInfo.cs | 11 +++++++++-- MainForm.cs | 6 +++--- Program.cs | 6 +++--- Properties/AssemblyInfo.cs | 4 ++-- bin/x86/Release/Xibo.scr | Bin 1058816 -> 1058816 bytes 5 files changed, 17 insertions(+), 10 deletions(-) diff --git a/Log/ClientInfo.cs b/Log/ClientInfo.cs index 34bb646d..8cdc3047 100644 --- a/Log/ClientInfo.cs +++ b/Log/ClientInfo.cs @@ -322,8 +322,15 @@ public void UpdateStatusMarkerFile() /// private void updateStatusFile() { - File.WriteAllText(Path.Combine(ApplicationSettings.Default.LibraryPath, "status.json"), - "{\"lastActivity\":\"" + DateTime.Now.ToString() + "\",\"state\":\"" + Thread.State.ToString() + "\",\"xmdsLastActivity\":\"" + ApplicationSettings.Default.XmdsLastConnection.ToString() + "\",\"xmdsCollectInterval\":\"" + ApplicationSettings.Default.CollectInterval.ToString() + "\"}"); + try + { + File.WriteAllText(Path.Combine(ApplicationSettings.Default.LibraryPath, "status.json"), + "{\"lastActivity\":\"" + DateTime.Now.ToString() + "\",\"state\":\"" + Thread.State.ToString() + "\",\"xmdsLastActivity\":\"" + ApplicationSettings.Default.XmdsLastConnection.ToString() + "\",\"xmdsCollectInterval\":\"" + ApplicationSettings.Default.CollectInterval.ToString() + "\"}"); + } + catch (Exception e) + { + Trace.WriteLine(new LogMessage("ClientInfo - updateStatusFile", "Failed to update status file. e = " + e.Message), LogType.Error.ToString()); + } } } } \ No newline at end of file diff --git a/MainForm.cs b/MainForm.cs index 86fbfbfa..5b466003 100644 --- a/MainForm.cs +++ b/MainForm.cs @@ -508,7 +508,7 @@ private void ChangeToNextLayout(string layoutPath) Controls.Remove(control); } - Trace.WriteLine(new LogMessage("MainForm - ChangeToNextLayout", "Destroy Layout Failed. Exception raised was: " + e.Message), LogType.Error.ToString()); + Trace.WriteLine(new LogMessage("MainForm - ChangeToNextLayout", "Destroy Layout Failed. Exception raised was: " + e.Message), LogType.Info.ToString()); throw e; } @@ -527,7 +527,7 @@ private void ChangeToNextLayout(string layoutPath) catch (Exception e) { DestroyLayout(); - Trace.WriteLine(new LogMessage("MainForm - ChangeToNextLayout", "Prepare Layout Failed. Exception raised was: " + e.Message), LogType.Error.ToString()); + Trace.WriteLine(new LogMessage("MainForm - ChangeToNextLayout", "Prepare Layout Failed. Exception raised was: " + e.Message), LogType.Info.ToString()); throw; } @@ -547,7 +547,7 @@ private void ChangeToNextLayout(string layoutPath) } catch (Exception e) { - Trace.WriteLine(new LogMessage("MainForm - ChangeToNextLayout", "Notify Status Failed. Exception raised was: " + e.Message), LogType.Error.ToString()); + Trace.WriteLine(new LogMessage("MainForm - ChangeToNextLayout", "Notify Status Failed. Exception raised was: " + e.Message), LogType.Info.ToString()); throw; } } diff --git a/Program.cs b/Program.cs index 35804fe4..9e92694a 100644 --- a/Program.cs +++ b/Program.cs @@ -124,7 +124,7 @@ static int Main(string[] args) Trace.Flush(); return 0; - } + } private static void RunClient() { @@ -201,8 +201,8 @@ static void HandleUnhandledException(Object o) Trace.WriteLine(new LogMessage("Main", "Unable to write to event log " + ex.Message), LogType.Error.ToString()); } - // Try to restart - Application.Restart(); + // Exit the application and allow it to be restarted by the Watchdog. + Application.Exit(); } [DllImport("User32.dll")] diff --git a/Properties/AssemblyInfo.cs b/Properties/AssemblyInfo.cs index bc48410b..b33fea05 100644 --- a/Properties/AssemblyInfo.cs +++ b/Properties/AssemblyInfo.cs @@ -30,6 +30,6 @@ // Build Number // Revision // -[assembly: AssemblyVersion("10.8.0.1")] -[assembly: AssemblyFileVersion("10.8.0.1")] +[assembly: AssemblyVersion("10.8.0.2")] +[assembly: AssemblyFileVersion("10.8.0.2")] [assembly: NeutralResourcesLanguageAttribute("en-GB")] diff --git a/bin/x86/Release/Xibo.scr b/bin/x86/Release/Xibo.scr index b684ed6a87de96a7f48a86478f32f9fbd560815a..dc90a068a5a72adffc9575369c81179bcf8e4d8a 100644 GIT binary patch delta 15609 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 Date: Thu, 22 Dec 2016 08:04:13 +0000 Subject: [PATCH 2/3] Bump version, rebuild --- Logic/ApplicationSettings.cs | 4 ++-- bin/x86/Release/Xibo.scr | Bin 1058816 -> 1058816 bytes 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Logic/ApplicationSettings.cs b/Logic/ApplicationSettings.cs index ebbcac9a..729e083d 100644 --- a/Logic/ApplicationSettings.cs +++ b/Logic/ApplicationSettings.cs @@ -39,9 +39,9 @@ public class ApplicationSettings private static string _default = "default"; // Application Specific Settings we want to protect - private string _clientVersion = "1.8.0-rc1"; + private string _clientVersion = "1.8.0-rc2"; private string _version = "5"; - private int _clientCodeVersion = 124; + private int _clientCodeVersion = 125; public string ClientVersion { get { return _clientVersion; } } public string Version { get { return _version; } } diff --git a/bin/x86/Release/Xibo.scr b/bin/x86/Release/Xibo.scr index dc90a068a5a72adffc9575369c81179bcf8e4d8a..18eb1e36f0aff190930be3eb0077c04f6a9b47e3 100644 GIT binary patch delta 170 zcmZp;;LvcvVL}JKf2E^<@%mKulK+FZi z+(66&#Jt=2wE4=ms+gJ^xtTaRyXZO@o4e?mIGI}NTAG?T>N=UZnHZW`7#drcx@=$Z zfbW<(qtW(!4t~Q#fwNxv;kBD1y{CF@`y$q85xaduCcl6R$U)N&_ws8pa%_Lw%P%|& E0Q`|Mk^lez delta 170 zcmZp;;LvcvVL}JKf2E^<@%mKulK+FZi z+(66&#Jt=2wE4=ms<^tCxH%b`y6762npo@Y$h!S)FTe0C E0N9!`;{X5v From 719456ec7d69fec07edb37ac8ca41d8ace31e1bd Mon Sep 17 00:00:00 2001 From: Dan Garner Date: Thu, 22 Dec 2016 08:05:43 +0000 Subject: [PATCH 3/3] Bump assembly version (forgot) and rebuild --- Properties/AssemblyInfo.cs | 4 ++-- bin/x86/Release/Xibo.scr | Bin 1058816 -> 1058816 bytes 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Properties/AssemblyInfo.cs b/Properties/AssemblyInfo.cs index b33fea05..4e2b8665 100644 --- a/Properties/AssemblyInfo.cs +++ b/Properties/AssemblyInfo.cs @@ -30,6 +30,6 @@ // Build Number // Revision // -[assembly: AssemblyVersion("10.8.0.2")] -[assembly: AssemblyFileVersion("10.8.0.2")] +[assembly: AssemblyVersion("10.8.0.3")] +[assembly: AssemblyFileVersion("10.8.0.3")] [assembly: NeutralResourcesLanguageAttribute("en-GB")] diff --git a/bin/x86/Release/Xibo.scr b/bin/x86/Release/Xibo.scr index 18eb1e36f0aff190930be3eb0077c04f6a9b47e3..8c9cd3add1da0aca6d33c7eb7f0d26aac31b7f2b 100644 GIT binary patch delta 193 zcmZp;;LvcvVL}I!O=n|QYZqf{7gK8&b88n%YZq&47h7u=duta*YZqs07guW+cWW0< zYZvd zb=kh+0pE`ffwNxv;kBD1y{CF@`y$q85xaduCjT{MMx*KNz5JFy7fe6Y%df@AvHfi? t|92KnCI$uu4hAj;rtNPh@tm_Ln8nH