1 files changed, 19 insertions, 1 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)