From e0c19a620f338848b130ad6d2bd0ce8d5a52ca93 Mon Sep 17 00:00:00 2001
From: Avi Levkovich <avi@twine-s.com>
Date: Wed, 18 Jul 2018 17:50:14 +0300
Subject: Flash R/W Buf

---
 .../MachineStudio/Tango.MachineStudio.UI/Resources/BuildDate.txt        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'Software/Visual_Studio/MachineStudio')

diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Resources/BuildDate.txt b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Resources/BuildDate.txt
index 4e5321cc7..2e68b7446 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Resources/BuildDate.txt
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Resources/BuildDate.txt
@@ -1 +1 @@
-Mon 07/16/2018 19:59:53.31 
+18-Jul-18 17:28:52.88 
-- 
cgit v1.3.1


From 4f81c6ce6c3b836bbfdb86532199aa37382b6147 Mon Sep 17 00:00:00 2001
From: Roy Ben-Shabat <Roy@Twine-s.com>
Date: Thu, 19 Jul 2018 13:55:25 +0300
Subject: Some improvements and fixes to machine studio logging module.

---
 Software/DB/Tango.mdf                              | Bin 75497472 -> 75497472 bytes
 Software/DB/Tango_log.ldf                          | Bin 1572864 -> 1572864 bytes
 .../ViewModels/ApplicationLogsViewVM.cs            |  64 ++++++++++++++++++++-
 .../ViewModels/EmbeddedLogsViewVM.cs               |  13 ++++-
 .../ViewModels/EventsViewVM.cs                     |  13 ++++-
 .../Views/ApplicationLogsView.xaml                 |   7 ++-
 .../Views/ApplicationLogsView.xaml.cs              |  10 ++++
 .../Views/EmbeddedLogsView.xaml                    |   2 +-
 .../Views/EmbeddedLogsView.xaml.cs                 |   5 ++
 .../Views/EventsView.xaml                          |   2 +-
 .../Views/EventsView.xaml.cs                       |   5 ++
 .../Tango.MachineStudio.UI/App.xaml.cs             |   3 +
 .../Tango.MachineStudio.UI/Resources/BuildDate.txt |   2 +-
 .../Tango.Integration/Operation/EmbeddedLogItem.cs |   9 +++
 .../Visual_Studio/Tango.Logging/LogItemBase.cs     |   2 +-
 .../Visual_Studio/Tango.Logging/VSOutputLogger.cs  |   5 +-
 .../Tango.Transport/TransporterBase.cs             |   8 ++-
 17 files changed, 134 insertions(+), 16 deletions(-)

(limited to 'Software/Visual_Studio/MachineStudio')

diff --git a/Software/DB/Tango.mdf b/Software/DB/Tango.mdf
index 3273ebdd4..7b7040e64 100644
Binary files a/Software/DB/Tango.mdf and b/Software/DB/Tango.mdf differ
diff --git a/Software/DB/Tango_log.ldf b/Software/DB/Tango_log.ldf
index 447bf18d1..ddc635704 100644
Binary files a/Software/DB/Tango_log.ldf and b/Software/DB/Tango_log.ldf differ
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/ViewModels/ApplicationLogsViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/ViewModels/ApplicationLogsViewVM.cs
index 2b12b1670..c56ca5541 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/ViewModels/ApplicationLogsViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/ViewModels/ApplicationLogsViewVM.cs
@@ -1,9 +1,11 @@
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
+using System.ComponentModel;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using System.Windows.Data;
 using Tango.Core.Commands;
 using Tango.Logging;
 using Tango.MachineStudio.Common.Notifications;
@@ -19,6 +21,8 @@ namespace Tango.MachineStudio.Logging.ViewModels
         private ApplicationLogFileParser _parser;
         private List<LogFile> _logFiles;
         private INotificationProvider _notification;
+        private bool _dialog_shown;
+        private bool _is_debug;
 
         private ControlledObservableCollection<LogItemBase> _realTimeLogs;
         private List<LogItemBase> _pausedLogs;
@@ -30,6 +34,29 @@ namespace Tango.MachineStudio.Logging.ViewModels
             set { _logs = value; RaisePropertyChangedAuto(); }
         }
 
+        private ICollectionView _logsViewSource;
+        public ICollectionView LogsViewSource
+        {
+            get { return _logsViewSource; }
+            set { _logsViewSource = value; RaisePropertyChangedAuto(); }
+        }
+
+        private String _filter;
+        public String Filter
+        {
+            get { return _filter; }
+            set
+            {
+                _filter = value;
+                RaisePropertyChangedAuto();
+
+                if (RealTimePaused)
+                {
+                    LogsViewSource.Refresh();
+                }
+            }
+        }
+
         private LogItemBase _selectedLog;
         public LogItemBase SelectedLog
         {
@@ -84,9 +111,19 @@ namespace Tango.MachineStudio.Logging.ViewModels
 
                 if (!_realTimePaused)
                 {
+                    LogsViewSource.Filter = null;
                     _realTimeLogs.InsertRange(0, _pausedLogs);
                     _pausedLogs.Clear();
                 }
+                else
+                {
+                    LogsViewSource.Filter = (x) =>
+                    {
+                        if (String.IsNullOrWhiteSpace(Filter)) return true;
+                        LogItemBase log = x as LogItemBase;
+                        return log.Message.ToLower().Contains(Filter.ToLower());
+                    };
+                }
             }
         }
 
@@ -126,6 +163,8 @@ namespace Tango.MachineStudio.Logging.ViewModels
             ToggleRealTimePaused = new RelayCommand(() => RealTimePaused = !RealTimePaused);
 
             ClearRealTimeLogsCommand = new RelayCommand(() => { _realTimeLogs.Clear(); });
+
+            _is_debug = LogManager.Categories.Contains(LogCategory.Debug);
         }
 
         private void LogManager_NewLog(object sender, LogItemBase log)
@@ -134,6 +173,17 @@ namespace Tango.MachineStudio.Logging.ViewModels
             {
                 InvokeUI(() =>
                 {
+                    if (_is_debug)
+                    {
+                        if (_realTimeLogs.Count > 1000)
+                        {
+                            for (int i = 998; i < _realTimeLogs.Count; i++)
+                            {
+                                _realTimeLogs.RemoveAt(i);
+                            }
+                        }
+                    }
+
                     _realTimeLogs.Insert(0, log);
                 });
             }
@@ -166,14 +216,22 @@ namespace Tango.MachineStudio.Logging.ViewModels
 
                 Logs = new ControlledObservableCollection<LogItemBase>(logs);
             }
+
+            LogsViewSource = CollectionViewSource.GetDefaultView(Logs);
         }
 
         private void OnSelectedLogChanged()
         {
-            if (SelectedLog != null)
+            if (SelectedLog != null && !_dialog_shown)
             {
-                _notification.ShowModalDialog<LogDetailsViewVM, ApplicationLogDetailsView>(new LogDetailsViewVM(SelectedLog), (x) => { }, () => { });
-                SelectedLog = null;
+                _dialog_shown = true;
+                _notification.ShowModalDialog<LogDetailsViewVM, ApplicationLogDetailsView>(new LogDetailsViewVM(SelectedLog), (x) => 
+                {
+                    
+                }, () => 
+                {
+                    _dialog_shown = false;
+                });
             }
         }
     }
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/ViewModels/EmbeddedLogsViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/ViewModels/EmbeddedLogsViewVM.cs
index 1895dd230..3f6775b75 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/ViewModels/EmbeddedLogsViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/ViewModels/EmbeddedLogsViewVM.cs
@@ -21,6 +21,7 @@ namespace Tango.MachineStudio.Logging.ViewModels
         private EmbeddedLogFileParser _parser;
         private List<LogFile> _logFiles;
         private INotificationProvider _notification;
+        private bool _dialog_shown;
 
         private ControlledObservableCollection<LogItemBase> _realTimeLogs;
         private List<LogItemBase> _pausedLogs;
@@ -172,10 +173,16 @@ namespace Tango.MachineStudio.Logging.ViewModels
 
         private void OnSelectedLogChanged()
         {
-            if (SelectedLog != null)
+            if (SelectedLog != null && !_dialog_shown)
             {
-                _notification.ShowModalDialog<LogDetailsViewVM, EmbeddedLogDetailsView>(new LogDetailsViewVM(SelectedLog), (x) => { }, () => { });
-                SelectedLog = null;
+                _dialog_shown = true;
+                _notification.ShowModalDialog<LogDetailsViewVM, EmbeddedLogDetailsView>(new LogDetailsViewVM(SelectedLog), (x) =>
+                {
+
+                }, () =>
+                {
+                    _dialog_shown = false;
+                });
             }
         }
     }
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/ViewModels/EventsViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/ViewModels/EventsViewVM.cs
index 98fcf12db..e2185bbdc 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/ViewModels/EventsViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/ViewModels/EventsViewVM.cs
@@ -25,6 +25,7 @@ namespace Tango.MachineStudio.Logging.ViewModels
         private ObservableCollection<MachinesEvent> _realTimeEvents;
         private Machine _connectedMachine;
         private LoggingNavigationManager _navigation;
+        private bool _dialog_shown;
 
         private Machine _selectedMachine;
         public Machine SelectedMachine
@@ -178,10 +179,16 @@ namespace Tango.MachineStudio.Logging.ViewModels
 
         private void OnSelectedEventChanged()
         {
-            if (SelectedEvent != null && SelectedEvent.Type != BL.Enumerations.EventTypes.ApplicationStarted)
+            if (SelectedEvent != null && SelectedEvent.Type != BL.Enumerations.EventTypes.ApplicationStarted && !_dialog_shown)
             {
-                _notification.ShowModalDialog<EventDetailsViewVM, EventDetailsView>(new EventDetailsViewVM(SelectedEvent), (x) => { }, () => { });
-                SelectedEvent = null;
+                _dialog_shown = true;
+                _notification.ShowModalDialog<EventDetailsViewVM, EventDetailsView>(new EventDetailsViewVM(SelectedEvent), (x) =>
+                {
+
+                }, () =>
+                {
+                    _dialog_shown = false;
+                });
             }
         }
 
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Views/ApplicationLogsView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Views/ApplicationLogsView.xaml
index 3ca10f370..310f4fd87 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Views/ApplicationLogsView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Views/ApplicationLogsView.xaml
@@ -99,6 +99,11 @@
                                 <TextBlock VerticalAlignment="Center" Margin="10 0 0 0">CLEAR</TextBlock>
                             </StackPanel>
                         </Button>
+
+                        <StackPanel Orientation="Horizontal" VerticalAlignment="Center" Margin="30 0 0 0">
+                            <materialDesign:PackIcon Kind="Magnify" Width="24" Height="24" />
+                            <TextBox VerticalAlignment="Center" Margin="10 0 0 0" Width="200" Text="{Binding Filter,UpdateSourceTrigger=PropertyChanged}" IsEnabled="{Binding RealTimePaused}" materialDesign:HintAssist.Hint="Filter" />
+                        </StackPanel>
                     </StackPanel>
                 </Grid>
             </Border>
@@ -113,7 +118,7 @@
                     <Grid>
                         <Grid>
                             <Grid>
-                                <DataGrid Background="Transparent" AutoGenerateColumns="False" SelectionMode="Single" ItemsSource="{Binding Logs}" SelectedItem="{Binding SelectedLog}" RowHeight="40" CanUserAddRows="False" CanUserDeleteRows="False" CanUserReorderColumns="True" IsReadOnly="True">
+                                <DataGrid x:Name="grid" Background="Transparent" RenderOptions.EdgeMode="Aliased" RenderOptions.BitmapScalingMode="LowQuality" MaxWidth="{Binding RelativeSource={RelativeSource AncestorType=Grid},Path=ActualWidth}" AutoGenerateColumns="False" SelectionMode="Single" SelectedCellsChanged="grid_SelectedCellsChanged"  ItemsSource="{Binding LogsViewSource}" SelectedItem="{Binding SelectedLog}" RowHeight="40" CanUserAddRows="False" CanUserDeleteRows="False" CanUserReorderColumns="True" IsReadOnly="True">
                                     <DataGrid.RowStyle>
                                         <Style TargetType="DataGridRow" BasedOn="{StaticResource {x:Type DataGridRow}}">
                                             <Style.Triggers>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Views/ApplicationLogsView.xaml.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Views/ApplicationLogsView.xaml.cs
index 6cdf6ea53..234fdfeab 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Views/ApplicationLogsView.xaml.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Views/ApplicationLogsView.xaml.cs
@@ -24,5 +24,15 @@ namespace Tango.MachineStudio.Logging.Views
         {
             InitializeComponent();
         }
+
+        private void DataGrid_Selected(object sender, RoutedEventArgs e)
+        {
+           
+        }
+
+        private void grid_SelectedCellsChanged(object sender, SelectedCellsChangedEventArgs e)
+        {
+            grid.SelectedIndex = -1;
+        }
     }
 }
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Views/EmbeddedLogsView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Views/EmbeddedLogsView.xaml
index ba6330f77..4573c8451 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Views/EmbeddedLogsView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Views/EmbeddedLogsView.xaml
@@ -113,7 +113,7 @@
                     <Grid>
                         <Grid>
                             <Grid>
-                                <DataGrid Background="Transparent" AutoGenerateColumns="False" SelectionMode="Single" ItemsSource="{Binding Logs}" SelectedItem="{Binding SelectedLog}" RowHeight="40" CanUserAddRows="False" CanUserDeleteRows="False" CanUserReorderColumns="True" IsReadOnly="True">
+                                <DataGrid x:Name="grid" SelectedCellsChanged="grid_SelectedCellsChanged" Background="Transparent" AutoGenerateColumns="False" SelectionMode="Single" ItemsSource="{Binding Logs}" SelectedItem="{Binding SelectedLog}" RowHeight="40" CanUserAddRows="False" CanUserDeleteRows="False" CanUserReorderColumns="True" IsReadOnly="True">
                                     <DataGrid.RowStyle>
                                         <Style TargetType="DataGridRow" BasedOn="{StaticResource {x:Type DataGridRow}}">
                                             <Style.Triggers>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Views/EmbeddedLogsView.xaml.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Views/EmbeddedLogsView.xaml.cs
index a728650cd..bc897cc82 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Views/EmbeddedLogsView.xaml.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Views/EmbeddedLogsView.xaml.cs
@@ -24,5 +24,10 @@ namespace Tango.MachineStudio.Logging.Views
         {
             InitializeComponent();
         }
+
+        private void grid_SelectedCellsChanged(object sender, SelectedCellsChangedEventArgs e)
+        {
+            grid.SelectedIndex = -1;
+        }
     }
 }
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Views/EventsView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Views/EventsView.xaml
index 9fe9e084e..196b6f930 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Views/EventsView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Views/EventsView.xaml
@@ -121,7 +121,7 @@
                     <Grid>
                         <Grid>
                             <Grid>
-                                <DataGrid Background="Transparent" AutoGenerateColumns="False" SelectionMode="Single" ItemsSource="{Binding Events}" SelectedItem="{Binding SelectedEvent}" RowHeight="40" CanUserAddRows="False" CanUserDeleteRows="False" CanUserReorderColumns="True" IsReadOnly="True">
+                                <DataGrid x:Name="grid" SelectedCellsChanged="grid_SelectedCellsChanged" Background="Transparent" AutoGenerateColumns="False" SelectionMode="Single" ItemsSource="{Binding Events}" SelectedItem="{Binding SelectedEvent}" RowHeight="40" CanUserAddRows="False" CanUserDeleteRows="False" CanUserReorderColumns="True" IsReadOnly="True">
                                     <DataGrid.RowStyle>
                                         <Style TargetType="DataGridRow" BasedOn="{StaticResource {x:Type DataGridRow}}">
                                             <Style.Triggers>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Views/EventsView.xaml.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Views/EventsView.xaml.cs
index b17eea54c..83710f1c9 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Views/EventsView.xaml.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Views/EventsView.xaml.cs
@@ -24,5 +24,10 @@ namespace Tango.MachineStudio.Logging.Views
         {
             InitializeComponent();
         }
+
+        private void grid_SelectedCellsChanged(object sender, SelectedCellsChangedEventArgs e)
+        {
+            grid.SelectedIndex = -1;
+        }
     }
 }
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/App.xaml.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/App.xaml.cs
index 2cc23f9e6..53171a1a3 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/App.xaml.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/App.xaml.cs
@@ -42,7 +42,10 @@ namespace Tango.MachineStudio.UI
             CoreSettings.DefaultDataBaseSource = "twine01\\SQLTWINE";
 #endif
 
+
+#if DEBUG
             LogManager.RegisterLogger(new VSOutputLogger());
+#endif
             LogManager.RegisterLogger(new FileLogger());
 
             LogManager.Log("Application Started...");
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Resources/BuildDate.txt b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Resources/BuildDate.txt
index c1f1cc77d..5b077f317 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Resources/BuildDate.txt
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Resources/BuildDate.txt
@@ -1 +1 @@
-Wed 07/18/2018 13:18:32.22 
+Thu 07/19/2018 13:37:34.59 
diff --git a/Software/Visual_Studio/Tango.Integration/Operation/EmbeddedLogItem.cs b/Software/Visual_Studio/Tango.Integration/Operation/EmbeddedLogItem.cs
index 5bd084566..a644b071d 100644
--- a/Software/Visual_Studio/Tango.Integration/Operation/EmbeddedLogItem.cs
+++ b/Software/Visual_Studio/Tango.Integration/Operation/EmbeddedLogItem.cs
@@ -58,5 +58,14 @@ namespace Tango.Integration.Operation
         {
             get { return Repeated > 1 ? String.Format("{0} ({1})", Message, Repeated) : Message; }
         }
+
+        /// <summary>
+        /// Gets the relative caller file path.
+        /// </summary>
+        /// <returns></returns>
+        protected override string GetRelativeCallerFilePath()
+        {
+            return CallerFile;
+        }
     }
 }
diff --git a/Software/Visual_Studio/Tango.Logging/LogItemBase.cs b/Software/Visual_Studio/Tango.Logging/LogItemBase.cs
index cd786c0e6..b914a33ef 100644
--- a/Software/Visual_Studio/Tango.Logging/LogItemBase.cs
+++ b/Software/Visual_Studio/Tango.Logging/LogItemBase.cs
@@ -67,7 +67,7 @@ namespace Tango.Logging
         /// Gets the relative caller file path.
         /// </summary>
         /// <returns></returns>
-        protected String GetRelativeCallerFilePath()
+        protected virtual String GetRelativeCallerFilePath()
         {
             if (base_path == null)
             {
diff --git a/Software/Visual_Studio/Tango.Logging/VSOutputLogger.cs b/Software/Visual_Studio/Tango.Logging/VSOutputLogger.cs
index 3804bdaa3..c2cd32437 100644
--- a/Software/Visual_Studio/Tango.Logging/VSOutputLogger.cs
+++ b/Software/Visual_Studio/Tango.Logging/VSOutputLogger.cs
@@ -27,7 +27,10 @@ namespace Tango.Logging
         /// <param name="output">The output.</param>
         public void OnLog(LogItemBase output)
         {
-            Debug.WriteLine(output.ToString());
+            if (output.Category != LogCategory.Debug)
+            {
+                Debug.WriteLine(output.ToString());
+            }
         }
 
         private bool _isEnabled;
diff --git a/Software/Visual_Studio/Tango.Transport/TransporterBase.cs b/Software/Visual_Studio/Tango.Transport/TransporterBase.cs
index d78905472..dbeae5b41 100644
--- a/Software/Visual_Studio/Tango.Transport/TransporterBase.cs
+++ b/Software/Visual_Studio/Tango.Transport/TransporterBase.cs
@@ -683,7 +683,7 @@ namespace Tango.Transport
                                 }
                                 else
                                 {
-                                    LogManager.Log("Pending request was identified as 'continuous response'. keeping pending request.", LogCategory.Debug);
+                                    LogManager.Log("Pending request was identified as 'continuous response' " + container.Type + ". keeping pending request.", LogCategory.Debug);
 
                                     try
                                     {
@@ -719,6 +719,12 @@ namespace Tango.Transport
                             }
                             else
                             {
+                                if (container.Type.ToString().EndsWith("Response"))
+                                {
+                                    LogManager.Log(String.Format("A response message with no awaiting request was identified. {0}, Token: {1}. Message ignored.", container.Type, container.Token), LogCategory.Warning);
+                                    continue;
+                                }
+
                                 LogManager.Log("Message was identified as a new request message: " + container.Type.ToString(), LogCategory.Debug);
 
                                 try
-- 
cgit v1.3.1