gsadmin/desktop-edge-win
1
0
Fork 0
mirror of https://github.com/openziti/desktop-edge-win.git synced 2026-10-13 08:11:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

no message

Browse Source
This commit is contained in:
Jeremy Tellier - ROG
2020-10-09 23:12:15 +01:00
parent 2cf7bc8aca b73d8c5563
commit 6ccf689f04
18 changed files with 159 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files
DesktopEdge/ServiceClient/DataStructures.cs
+31
View File
@@ -165,6 +165,18 @@ namespace ZitiDesktopEdge.ServiceClient
public string DNS { get; set; }
}
class ServiceVersion
{
public string Version { get; set; }
public string Revision { get; set; }
public string BuildDate { get; set; }
public override string ToString()
{
return $"Version: {Version}, Revision: {Revision}, BuildDate: {BuildDate}";
}
}
class ZitiTunnelStatus : SvcResponse
{
public TunnelStatus Status { get; set; }
@@ -182,8 +194,11 @@ namespace ZitiDesktopEdge.ServiceClient
public string LogLevel { get; set; }
public ServiceVersion ServiceVersion { get; set; }
public void Dump(System.IO.TextWriter writer)
{
<<<<<<< HEAD
try {
writer.WriteLine($"Tunnel Active: {Active}");
writer.WriteLine($" LogLevel : {LogLevel}");
@@ -198,6 +213,22 @@ namespace ZitiDesktopEdge.ServiceClient
writer.WriteLine($" Name: {s.Name} HostName: {s.InterceptHost} Port: {s.InterceptPort}");
}
writer.WriteLine("=============================================");
=======
writer.WriteLine($"Tunnel Active: {Active}");
writer.WriteLine($" ServiceVersion : {ServiceVersion}");
writer.WriteLine($" LogLevel : {LogLevel}");
writer.WriteLine($" EvaluatedLogLevel: {EvaluateLogLevel()}");
foreach (Identity id in Identities)
{
writer.WriteLine($" FingerPrint: {id.FingerPrint}");
writer.WriteLine($" Name : {id.Name}");
writer.WriteLine($" Active : {id.Active}");
writer.WriteLine($" Status : {id.Status}");
writer.WriteLine($" Services:");
foreach (Service s in id?.Services)
{
writer.WriteLine($" Name: {s.Name} HostName: {s.InterceptHost} Port: {s.InterceptPort}");
>>>>>>> b73d8c5563fcb51ed0c170b6da19f6e3d29d0e55
}
} catch (Exception e) {