From 4b95b6c19bdf18e50068285b3b0a8a8ab0a7b4ce Mon Sep 17 00:00:00 2001 From: Roy Ben-Shabat Date: Wed, 24 Apr 2019 19:30:23 +0300 Subject: Machine Studio v4.0.13.0 PPC v1.0.11.0 --- .../Tango.MachineStudio.Common/Publish/MachineStudioPublisher.cs | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common') diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Publish/MachineStudioPublisher.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Publish/MachineStudioPublisher.cs index fb5fbc27c..92326f26f 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Publish/MachineStudioPublisher.cs +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Publish/MachineStudioPublisher.cs @@ -201,8 +201,10 @@ namespace Tango.MachineStudio.Common.Publish using (ZipFile zip = new ZipFile()) { - zip.AddDirectory(Path.Combine(folder, "x86"), "/x86"); - zip.AddDirectory(Path.Combine(folder, "x64"), "/x64"); + foreach (var directory in Directory.GetDirectories(folder)) + { + zip.AddDirectory(directory, $"/{Path.GetFileName(directory)}"); + } var files = Directory.GetFiles(folder, "*.*", SearchOption.TopDirectoryOnly).ToList(); @@ -219,6 +221,7 @@ namespace Tango.MachineStudio.Common.Publish } }; + zip.ParallelDeflateThreshold = -1; zip.Save(tempFile); } -- cgit v1.3.1 From ca615f9192350dadd7be4ab0e096e380816ca2a6 Mon Sep 17 00:00:00 2001 From: Roy Ben-Shabat Date: Tue, 30 Apr 2019 10:08:36 +0300 Subject: Added keep alive to External Bridge Service => Client. --- Software/DB/PPC/Tango.mdf | Bin 75497472 -> 75497472 bytes Software/DB/PPC/Tango_log.ldf | Bin 53673984 -> 53673984 bytes .../Build/Shortcuts/Machine Studio.lnk | Bin 1518 -> 1502 bytes .../EventLogging/DefaultEventLogger.cs | 2 +- .../EventLogging/DefaultEventLogger.cs | 2 +- .../ExternalBridge/ExternalBridgeService.cs | 11 +++++++++++ 6 files changed, 13 insertions(+), 2 deletions(-) (limited to 'Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common') diff --git a/Software/DB/PPC/Tango.mdf b/Software/DB/PPC/Tango.mdf index 8848eced3..33f901e18 100644 Binary files a/Software/DB/PPC/Tango.mdf and b/Software/DB/PPC/Tango.mdf differ diff --git a/Software/DB/PPC/Tango_log.ldf b/Software/DB/PPC/Tango_log.ldf index 2062993f9..4feec6555 100644 Binary files a/Software/DB/PPC/Tango_log.ldf and b/Software/DB/PPC/Tango_log.ldf differ diff --git a/Software/Visual_Studio/Build/Shortcuts/Machine Studio.lnk b/Software/Visual_Studio/Build/Shortcuts/Machine Studio.lnk index 701a14ad5..8b7c552b7 100644 Binary files a/Software/Visual_Studio/Build/Shortcuts/Machine Studio.lnk and b/Software/Visual_Studio/Build/Shortcuts/Machine Studio.lnk differ diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/EventLogging/DefaultEventLogger.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/EventLogging/DefaultEventLogger.cs index 8347c3144..79c032967 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/EventLogging/DefaultEventLogger.cs +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/EventLogging/DefaultEventLogger.cs @@ -218,7 +218,7 @@ namespace Tango.MachineStudio.Common.EventLogging } } - LogManager.Log("Logging event " + machineEvent.EventType.Name + " - " + machineEvent.Description); + LogManager.Log("Logging event " + machineEvent.EventType.Name); machineEvent.MachineGuid = _application.Machine.Guid; machineEvent.UserGuid = _authentication.CurrentUser.Guid; machineEvent.User = _authentication.CurrentUser; diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/EventLogging/DefaultEventLogger.cs b/Software/Visual_Studio/PPC/Tango.PPC.Common/EventLogging/DefaultEventLogger.cs index 25eb2df04..2e622b8e0 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.Common/EventLogging/DefaultEventLogger.cs +++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/EventLogging/DefaultEventLogger.cs @@ -222,7 +222,7 @@ namespace Tango.PPC.Common.EventLogging } } - LogManager.Log("Logging event " + machineEvent.EventType.Name + " - " + machineEvent.Description); + LogManager.Log("Logging event " + machineEvent.EventType.Name); machineEvent.MachineGuid = _machineProvider.Machine.Guid; machineEvent.UserGuid = _authentication.CurrentUser.Guid; machineEvent.User = _authentication.CurrentUser; diff --git a/Software/Visual_Studio/Tango.Integration/ExternalBridge/ExternalBridgeService.cs b/Software/Visual_Studio/Tango.Integration/ExternalBridge/ExternalBridgeService.cs index 42cd0f6de..376befe06 100644 --- a/Software/Visual_Studio/Tango.Integration/ExternalBridge/ExternalBridgeService.cs +++ b/Software/Visual_Studio/Tango.Integration/ExternalBridge/ExternalBridgeService.cs @@ -121,6 +121,8 @@ namespace Tango.Integration.ExternalBridge /// public ExternalBridgeService() { + UseKeepAlive = true; + var settings = SettingsManager.Default.GetOrCreate(); _discovery_port = settings.ExternalBridgeServiceDiscoveryPort; @@ -374,6 +376,15 @@ namespace Tango.Integration.ExternalBridge OnClientDisconnected(); } + protected override void OnFailed(Exception ex) + { + if (ex is KeepAliveException) + { + LogManager.Log("External bridge client has failed to provide a keep alive response. Disconnecting session..."); + } + + base.OnFailed(ex); + } #endregion #region Virtual Methods -- cgit v1.3.1