merge conflicts -take remote

3 files changed, 24 insertions, 7 deletions

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 b92c9f285..f1a205f5d 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/EventLogging/DefaultEventLogger.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/EventLogging/DefaultEventLogger.cs
@@ -47,6 +47,15 @@ namespace Tango.MachineStudio.Common.EventLogging
 
         #endregion
 
+        #region Properties
+
+        /// <summary>
+        /// Gets or sets a value indicating whether to save the incoming events to database.
+        /// </summary>
+        public bool SaveToDB { get; set; }
+
+        #endregion
+
         #region Constructors
 
         /// <summary>
@@ -58,6 +67,8 @@ namespace Tango.MachineStudio.Common.EventLogging
         {
             _hostName = Environment.MachineName;
 
+            SaveToDB = true;
+
             _events = new ConcurrentQueue<MachinesEvent>();
             _pendingEvents = new List<MachinesEvent>();
 
@@ -128,6 +139,8 @@ namespace Tango.MachineStudio.Common.EventLogging
                 machine.RequestSent += Machine_RequestSent;
                 machine.RequestFailed += Machine_RequestFailed;
                 machine.ResponseReceived += Machine_ResponseReceived;
+
+                SaveToDB = !(machine is IExternalBridgeSecureClient);
             }
         }
 
@@ -244,7 +257,7 @@ namespace Tango.MachineStudio.Common.EventLogging
             machineEvent.EventType = _eventTypesGuids[eventType];
             machineEvent.EventTypeGuid = machineEvent.EventType.Guid;
 
-            if (write_to_db)
+            if (write_to_db && SaveToDB)
             {
                 Log(machineEvent);
             }
@@ -308,6 +321,11 @@ namespace Tango.MachineStudio.Common.EventLogging
         /// </summary>
         public void FlushAll()
         {
+            if (!SaveToDB)
+            {
+                return;
+            }
+
             bool _saveChanges = false;
 
             while (_events.Count > 0)
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/EventLogging/IEventLogger.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/EventLogging/IEventLogger.cs
index ceb399d24..44916ec21 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/EventLogging/IEventLogger.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/EventLogging/IEventLogger.cs
@@ -20,6 +20,11 @@ namespace Tango.MachineStudio.Common.EventLogging
         event EventHandler<MachinesEvent> NewLog;
 
         /// <summary>
+        /// Gets or sets a value indicating whether to save the incoming events to database.
+        /// </summary>
+        bool SaveToDB { get; set; }
+
+        /// <summary>
         /// Logs the specified machine event.
         /// </summary>
         /// <param name="machineEvent">The machine event.</param>
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/MachineStudioSettings.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/MachineStudioSettings.cs
index 7a016b376..25dfc2dc8 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/MachineStudioSettings.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/MachineStudioSettings.cs
@@ -57,11 +57,6 @@ namespace Tango.MachineStudio.Common
         public String LastVirtualMachineSerialNumber { get; set; }
 
         /// <summary>
-        /// Gets or sets the logging categories.
-        /// </summary>
-        public List<LogCategory> LoggingCategories { get; set; }
-
-        /// <summary>
         /// Gets or sets the last bounds.
         /// </summary>
         public Rect LastBounds { get; set; }
@@ -189,7 +184,6 @@ namespace Tango.MachineStudio.Common
         public MachineStudioSettings()
         {
             LastBounds = new Rect();
-            LoggingCategories = new List<LogCategory>();
             DefaultIssueReportTags = new List<string>();
             StudioModulesBounds = new List<StudioModuleBounds>();
             Environment = WorkingEnvironment.Remote;