Merge MKDT_0007

This commit is contained in:
2025-04-28 12:51:07 -04:00
parent dd988c286f
commit aab934a0e0
2 changed files with 7 additions and 17 deletions

View File

@@ -27,6 +27,7 @@ namespace IPMonitor
/// <param name="configuration"></param> /// <param name="configuration"></param>
public void RunService(String[] args,IConfiguration configuration) public void RunService(String[] args,IConfiguration configuration)
{ {
Profiler profiler=new Profiler();
DateTime currentDate = DateTime.Now; DateTime currentDate = DateTime.Now;
GlobalConfig.Instance.Configuration = configuration; // This call sets up configuration stuff so it needs to be first. GlobalConfig.Instance.Configuration = configuration; // This call sets up configuration stuff so it needs to be first.
@@ -41,8 +42,6 @@ namespace IPMonitor
try try
{ {
Profiler profiler=new Profiler();
profiler.Start();
MDTrace.WriteLine(LogLevel.DEBUG,$"[RunService] Started @ {Utility.DateTimeToStringYYYYHMMHDDHHMMSSTT(currentDate)} in {Directory.GetCurrentDirectory()}"); MDTrace.WriteLine(LogLevel.DEBUG,$"[RunService] Started @ {Utility.DateTimeToStringYYYYHMMHDDHHMMSSTT(currentDate)} in {Directory.GetCurrentDirectory()}");
MDTrace.WriteLine(LogLevel.DEBUG,$"[RunService] Argument {arg}"); MDTrace.WriteLine(LogLevel.DEBUG,$"[RunService] Argument {arg}");
@@ -59,6 +58,10 @@ namespace IPMonitor
{ {
MDTrace.WriteLine(LogLevel.DEBUG,String.Format("Exception:{0}",exception.ToString())); MDTrace.WriteLine(LogLevel.DEBUG,String.Format("Exception:{0}",exception.ToString()));
} }
finally
{
MDTrace.WriteLine(LogLevel.DEBUG,$"Done, total took {profiler.End()} (ms)");
}
} }
private static bool CreateLogging(String task) private static bool CreateLogging(String task)
@@ -147,7 +150,7 @@ namespace IPMonitor
for(int index=0;index<MAX_RETRIES && null==address;index++) for(int index=0;index<MAX_RETRIES && null==address;index++)
{ {
MDTrace.WriteLine(LogLevel.DEBUG,$"Requesting IPAddress from {request}"); MDTrace.WriteLine(LogLevel.DEBUG,$"Requesting IPAddress from {request}");
if(!NetworkStatus.IsNetworkAvailable(0)) if(!NetworkStatus.IsNetworkAvailable())
{ {
MDTrace.WriteLine(LogLevel.DEBUG,String.Format("The Network seems to be disconnected. Will retry after {0} (ms) ",request,TIMEOUT_BETWEEN_ATTEMPTS)); MDTrace.WriteLine(LogLevel.DEBUG,String.Format("The Network seems to be disconnected. Will retry after {0} (ms) ",request,TIMEOUT_BETWEEN_ATTEMPTS));
try{Thread.Sleep(TIMEOUT_BETWEEN_ATTEMPTS);}catch{;} try{Thread.Sleep(TIMEOUT_BETWEEN_ATTEMPTS);}catch{;}

View File

@@ -7,18 +7,6 @@ namespace MarketData.Integration
private NetworkStatus() private NetworkStatus()
{ {
} }
/// <summary>
/// Indicates whether any network connection is available
/// Filter connections below a specified speed, as well as virtual network cards.
/// </summary>
/// <returns>
/// <c>true</c> if a network connection is available; otherwise, <c>false</c>.
/// </returns>
public static bool IsNetworkAvailable()
{
return IsNetworkAvailable(0);
}
// On Linux platforms we must be priveleged to send custom payloads so we are using the send option that does not require a payload // On Linux platforms we must be priveleged to send custom payloads so we are using the send option that does not require a payload
// This differs from the windows implementation // This differs from the windows implementation
public static bool IsInternetConnected() public static bool IsInternetConnected()
@@ -53,11 +41,10 @@ namespace MarketData.Integration
/// Indicates whether any network connection is available. /// Indicates whether any network connection is available.
/// Filter connections below a specified speed, as well as virtual network cards. /// Filter connections below a specified speed, as well as virtual network cards.
/// </summary> /// </summary>
/// <param name="minimumSpeed">The minimum speed required. Passing 0 will not filter connection using speed.</param>
/// <returns> /// <returns>
/// <c>true</c> if a network connection is available; otherwise, <c>false</c>. /// <c>true</c> if a network connection is available; otherwise, <c>false</c>.
/// </returns> /// </returns>
public static bool IsNetworkAvailable(long minimumSpeed) public static bool IsNetworkAvailable()
{ {
if (!NetworkInterface.GetIsNetworkAvailable()) if (!NetworkInterface.GetIsNetworkAvailable())
return false; return false;