pepperdash/PepperDashCore
1
0
Fork 0
mirror of https://github.com/PepperDash/PepperDashCore.git synced 2026-02-16 13:14:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Changed Debug.Console methods to log all messages marked as such to log; ssh cleanup

Browse Source
This commit is contained in:
Heath Volmer
2018-08-31 11:50:01 -05:00
parent 7c2f4c2c24
commit 07aef1878c
5 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
CLZ Builds/PepperDash_Core.clz
View File

Binary file not shown.

BIN
CLZ Builds/PepperDash_Core.dll
View File

Binary file not shown.

2
Pepperdash Core/Pepperdash Core/Comm/GenericSshClient.cs
View File

@@ -293,8 +293,6 @@ namespace PepperDash.Core
/// </summary> /// </summary>
void HandleConnectionFailure() void HandleConnectionFailure()
{ {
if (Client != null) if (Client != null)
Client.Disconnect(); Client.Disconnect();
KillStream(); KillStream();

21
Pepperdash Core/Pepperdash Core/Logging/Debug.cs
View File

@@ -234,7 +234,7 @@ namespace PepperDash.Core
} }
/// <summary> /// <summary>
/// Appends a device Key to the beginning of a message /// Logs to Console when at-level, and all messages to error log, including device key
/// </summary> /// </summary>
public static void Console(uint level, IKeyed dev, string format, params object[] items) public static void Console(uint level, IKeyed dev, string format, params object[] items)
{ {
@@ -245,23 +245,26 @@ namespace PepperDash.Core
public static void Console(uint level, IKeyed dev, ErrorLogLevel errorLogLevel, public static void Console(uint level, IKeyed dev, ErrorLogLevel errorLogLevel,
string format, params object[] items) string format, params object[] items)
{ {
var str = string.Format("[{0}] {1}", dev.Key, string.Format(format, items));
LogError(errorLogLevel, str);
if (Level >= level) if (Level >= level)
{ {
var str = string.Format("[{0}] {1}", dev.Key, string.Format(format, items));
Console(level, str); Console(level, str);
LogError(errorLogLevel, str);
} }
} }
/// <summary>
/// Logs to Console when at-level, and all messages to error log
/// </summary>
public static void Console(uint level, ErrorLogLevel errorLogLevel, public static void Console(uint level, ErrorLogLevel errorLogLevel,
string format, params object[] items) string format, params object[] items)
{ {
if (Level >= level) var str = string.Format(format, items);
{ LogError(errorLogLevel, str);
var str = string.Format(format, items); if (Level >= level)
Console(level, str); {
LogError(errorLogLevel, str); Console(level, str);
} }
} }
/// <summary> /// <summary>

2
Pepperdash Core/Pepperdash Core/Properties/AssemblyInfo.cs
View File

@@ -4,4 +4,4 @@
[assembly: AssemblyCompany("")] [assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("Pepperdash_Core")] [assembly: AssemblyProduct("Pepperdash_Core")]
[assembly: AssemblyCopyright("Copyright © PepperDash 2016")] [assembly: AssemblyCopyright("Copyright © PepperDash 2016")]
[assembly: AssemblyVersion("1.0.7.*")] [assembly: AssemblyVersion("1.0.8.*")]