pepperdash/PepperDashCore
1
0
Fork 0
mirror of https://github.com/PepperDash/PepperDashCore.git synced 2026-08-31 19:08:26 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #66 from PepperDash/bugfix/stream-debugging-fixes

Browse source 
Fixes some exceptions when setting stream debugging mode
This commit is contained in:
Andrew Welker 2020-10-28 11:35:42 -06:00 • committed by GitHub
commit 32011b6f8c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

23
Pepperdash Core/Pepperdash Core/Comm/CommunicationStreamDebugging.cs
View file

@ -79,10 +79,7 @@ namespace PepperDash.Core
_DebugTimeoutInMs = minutes * 60000; _DebugTimeoutInMs = minutes * 60000;
if (DebugExpiryPeriod != null) StopDebugTimer();
{
DisableDebugging();
}
DebugExpiryPeriod = new CTimer((o) => DisableDebugging(), _DebugTimeoutInMs); DebugExpiryPeriod = new CTimer((o) => DisableDebugging(), _DebugTimeoutInMs);
@ -101,14 +98,24 @@ namespace PepperDash.Core
/// </summary> /// </summary>
private void DisableDebugging() private void DisableDebugging()
{ {
DebugExpiryPeriod.Stop(); StopDebugTimer();
DebugExpiryPeriod.Dispose();
DebugExpiryPeriod = null;
Debug.SetDeviceDebugSettings(ParentDeviceKey, eStreamDebuggingSetting.Off);
}
private void StopDebugTimer()
{
RxStreamDebuggingIsEnabled = false; RxStreamDebuggingIsEnabled = false;
TxStreamDebuggingIsEnabled = false; TxStreamDebuggingIsEnabled = false;
Debug.SetDeviceDebugSettings(ParentDeviceKey, eStreamDebuggingSetting.Off); if (DebugExpiryPeriod == null)
{
return;
}
DebugExpiryPeriod.Stop();
DebugExpiryPeriod.Dispose();
DebugExpiryPeriod = null;
} }
} }

6
Pepperdash Core/Pepperdash Core/Logging/DebugMemory.cs
View file

@ -68,11 +68,9 @@ namespace PepperDash.Core.DebugThings
/// <returns></returns> /// <returns></returns>
public void SetDebugSettingsForKey(string deviceKey, object settings) public void SetDebugSettingsForKey(string deviceKey, object settings)
{ {
var existingSettings = DeviceDebugSettings[deviceKey]; if(DeviceDebugSettings.ContainsKey(deviceKey))
if (existingSettings != null)
{ {
existingSettings = settings; DeviceDebugSettings[deviceKey] = settings;
} }
else else
DeviceDebugSettings.Add(deviceKey, settings); DeviceDebugSettings.Add(deviceKey, settings);