Major upgrade

This commit is contained in:
Duc
2025-10-24 15:18:11 -07:00
parent fd85735c93
commit ce583d1664
478 changed files with 237518 additions and 47610 deletions

View File

@@ -15,12 +15,11 @@ GOVERNMENT.
UNPUBLISHED WORK - COPYRIGHT RAYTHEON COMPANY.
-------------------------------------------------------------------------*/
using Raytheon.Instruments;
using Raytheon.Common;
using System;
using System.Threading;
using ChillerCartMeasurementManagerLib;
using NLog;
using Raytheon.Instruments;
namespace MeasurementManagerLib
{
@@ -165,15 +164,6 @@ namespace MeasurementManagerLib
_logger?.Error(err.Message + "\r\n" + err.StackTrace);
}
}
try
{
ErrorLogger.Instance().Dispose();
}
catch (Exception)
{
// nothing to do
}
}
}

View File

@@ -16,10 +16,11 @@ UNPUBLISHED WORK - COPYRIGHT RAYTHEON COMPANY.
-------------------------------------------------------------------------*/
using System;
using System.Threading;
using Raytheon.Common;
using System.IO;
using System.Threading;
using MeasurementManagerLib;
using NLog;
using Raytheon.Common;
namespace ChillerCartMeasurementManagerLib
{
@@ -37,6 +38,7 @@ namespace ChillerCartMeasurementManagerLib
private readonly ChillerCartMeasurementManager.ChillerDelegate _callback;
private readonly string _logFileName;
private readonly int _threadRestTimeMs;
private readonly ILogger _logger;
#endregion
#region PrivateFunctions
@@ -55,25 +57,11 @@ namespace ChillerCartMeasurementManagerLib
/// <param name="disposing"></param>
protected virtual void Dispose(bool disposing)
{
try
if (disposing)
{
if (disposing)
{
_fileWriter.Dispose();
_fileWriter.Dispose();
_quitEvent.Dispose();
}
}
catch (Exception err)
{
try
{
ErrorLogger.Instance().Write(err.Message + "\r\n" + err.StackTrace);
}
catch (Exception)
{
//Do not rethrow. Exception from error logger that has already been garbage collected
}
_quitEvent.Dispose();
}
}
#endregion
@@ -88,6 +76,8 @@ namespace ChillerCartMeasurementManagerLib
/// <param name="callback"></param>
public ChillerDataLogWorker(ChillerCartMeasurementManager controller, string logFileName, int threadRestTimeMs, ChillerCartMeasurementManager.ChillerDelegate callback)
{
_logger = LogManager.GetCurrentClassLogger();
_threadQuitControl = false;
_quitEvent = new AutoResetEvent(false);
@@ -123,23 +113,9 @@ namespace ChillerCartMeasurementManagerLib
/// </summary>
public void Dispose()
{
try
{
Dispose(true);
Dispose(true);
GC.SuppressFinalize(this);
}
catch (Exception err)
{
try
{
ErrorLogger.Instance().Write(err.Message + "\r\n" + err.StackTrace);
}
catch (Exception)
{
//Do not rethrow. Exception from error logger that has already been garbage collected
}
}
GC.SuppressFinalize(this);
}
/// <summary>
@@ -176,7 +152,6 @@ namespace ChillerCartMeasurementManagerLib
catch (Exception e)
{
string msg = e.Message;
ErrorLogger.Instance().Write(msg + "\r\n" + e.StackTrace, ErrorLogger.LogLevel.ERROR);
_fileWriter.WriteLine(Util.GetTimeString() + ", " + msg);
@@ -184,12 +159,9 @@ namespace ChillerCartMeasurementManagerLib
_callback?.Invoke(-1, -1, -1);
}
}
ErrorLogger.Instance().Write("ChillerCartDataLogWorker::DoWork() - exiting", ErrorLogger.LogLevel.INFO);
}
catch (Exception err)
catch (Exception)
{
ErrorLogger.Instance().Write(err.Message + "\r\n" + err.StackTrace);
//Send error code to callback if valid
_callback?.Invoke(-1, -1, -1);
}

View File

@@ -16,10 +16,11 @@ UNPUBLISHED WORK - COPYRIGHT RAYTHEON COMPANY.
-------------------------------------------------------------------------*/
using System;
using System.Threading;
using Raytheon.Common;
using System.IO;
using System.Threading;
using MeasurementManagerLib;
using NLog;
using Raytheon.Common;
namespace ChillerCartMeasurementManagerLib
{
@@ -37,6 +38,7 @@ namespace ChillerCartMeasurementManagerLib
private readonly ChillerCartMeasurementManager.FlowMeterDelegate _callback;
private readonly string _logFileName;
private readonly int _threadRestTimeMs;
private readonly ILogger _logger;
#endregion
#region PrivateFunctions
@@ -56,25 +58,11 @@ namespace ChillerCartMeasurementManagerLib
/// <param name="disposing"></param>
protected virtual void Dispose(bool disposing)
{
try
if (disposing)
{
if (disposing)
{
_fileWriter.Dispose();
_fileWriter.Dispose();
_quitEvent.Dispose();
}
}
catch (Exception err)
{
try
{
ErrorLogger.Instance().Write(err.Message + "\r\n" + err.StackTrace);
}
catch (Exception)
{
//Do not rethrow. Exception from error logger that has already been garbage collected
}
_quitEvent.Dispose();
}
}
#endregion
@@ -89,6 +77,8 @@ namespace ChillerCartMeasurementManagerLib
/// <param name="callback"></param>
public FlowMeterDataLogWorker(ChillerCartMeasurementManager controller, string logFileName, int threadRestTimeMs, ChillerCartMeasurementManager.FlowMeterDelegate callback)
{
_logger = LogManager.GetCurrentClassLogger();
_threadQuitControl = false;
_quitEvent = new AutoResetEvent(false);
@@ -122,23 +112,9 @@ namespace ChillerCartMeasurementManagerLib
/// </summary>
public void Dispose()
{
try
{
Dispose(true);
Dispose(true);
GC.SuppressFinalize(this);
}
catch (Exception err)
{
try
{
ErrorLogger.Instance().Write(err.Message + "\r\n" + err.StackTrace);
}
catch (Exception)
{
//Do not rethrow. Exception from error logger that has already been garbage collected
}
}
GC.SuppressFinalize(this);
}
/// <summary>
@@ -175,8 +151,6 @@ namespace ChillerCartMeasurementManagerLib
{
string msg = e.Message;
ErrorLogger.Instance().Write(msg + "\r\n" + e.StackTrace, ErrorLogger.LogLevel.ERROR);
_fileWriter.WriteLine(Util.GetTimeString() + ", " + msg);
//Invoke the callback if valid
@@ -186,12 +160,9 @@ namespace ChillerCartMeasurementManagerLib
}
}
}
ErrorLogger.Instance().Write("FlowMeterDataLogWorker::DoWork() - exiting", ErrorLogger.LogLevel.INFO);
}
catch (Exception err)
catch (Exception)
{
ErrorLogger.Instance().Write(err.Message + "\r\n" + err.StackTrace);
//Send error code to callback if valid
if (_callback != null && _threadQuitControl == false)
{

View File

@@ -16,10 +16,11 @@ UNPUBLISHED WORK - COPYRIGHT RAYTHEON COMPANY.
-------------------------------------------------------------------------*/
using System;
using System.Threading;
using Raytheon.Common;
using System.IO;
using System.Threading;
using MeasurementManagerLib;
using NLog;
using Raytheon.Common;
namespace ChillerCartMeasurementManagerLib
{
@@ -37,6 +38,7 @@ namespace ChillerCartMeasurementManagerLib
private readonly ChillerCartMeasurementManager.TemperatureDelegate _callback;
private readonly string _logFileName;
private readonly int _threadRestTimeMs;
private readonly ILogger _logger;
#endregion
@@ -57,25 +59,11 @@ namespace ChillerCartMeasurementManagerLib
/// <param name="disposing"></param>
protected virtual void Dispose(bool disposing)
{
try
if (disposing)
{
if (disposing)
{
_fileWriter.Dispose();
_fileWriter.Dispose();
_quitEvent.Dispose();
}
}
catch (Exception err)
{
try
{
ErrorLogger.Instance().Write(err.Message + "\r\n" + err.StackTrace);
}
catch (Exception)
{
//Do not rethrow. Exception from error logger that has already been garbage collected
}
_quitEvent.Dispose();
}
}
#endregion
@@ -91,6 +79,8 @@ namespace ChillerCartMeasurementManagerLib
/// <param name="callback"></param>
public TempDataLogWorker(ChillerCartMeasurementManager controller, string logFileName, int threadRestTimeMs, ChillerCartMeasurementManager.TemperatureDelegate callback)
{
_logger = LogManager.GetCurrentClassLogger();
_threadQuitControl = false;
_quitEvent = new AutoResetEvent(false);
@@ -125,23 +115,9 @@ namespace ChillerCartMeasurementManagerLib
/// </summary>
public void Dispose()
{
try
{
Dispose(true);
Dispose(true);
GC.SuppressFinalize(this);
}
catch (Exception err)
{
try
{
ErrorLogger.Instance().Write(err.Message + "\r\n" + err.StackTrace);
}
catch (Exception)
{
//Do not rethrow. Exception from error logger that has already been garbage collected
}
}
GC.SuppressFinalize(this);
}
/// <summary>
@@ -177,7 +153,6 @@ namespace ChillerCartMeasurementManagerLib
catch (Exception e)
{
string msg = e.Message;
ErrorLogger.Instance().Write(msg + "\r\n" + e.StackTrace, ErrorLogger.LogLevel.ERROR);
_fileWriter.WriteLine(Util.GetTimeString() + ", " + msg);
@@ -185,12 +160,9 @@ namespace ChillerCartMeasurementManagerLib
_callback?.Invoke(-1, -1);
}
}
ErrorLogger.Instance().Write("TempDataLogWorker::DoWork() - exiting", ErrorLogger.LogLevel.INFO);
}
catch (Exception err)
catch (Exception)
{
ErrorLogger.Instance().Write(err.Message + "\r\n" + err.StackTrace);
//Send error code to callback if valid
_callback(-1, -1);
}