调整日志方式
This commit is contained in:
parent
d5d6eddfc8
commit
c640420188
|
|
@ -54,7 +54,7 @@ namespace LY.App.Device
|
||||||
private readonly RedisService _redis = ServiceLocator.Instance.GetService<RedisService>();
|
private readonly RedisService _redis = ServiceLocator.Instance.GetService<RedisService>();
|
||||||
private static readonly object _lock = new object();
|
private static readonly object _lock = new object();
|
||||||
private readonly CancellationTokenSource _monitorCancellationTokenSource = new();
|
private readonly CancellationTokenSource _monitorCancellationTokenSource = new();
|
||||||
private readonly LogService _log = ServiceLocator.Instance.GetService<LogService>();
|
|
||||||
private DeviceManager()
|
private DeviceManager()
|
||||||
{
|
{
|
||||||
|
|
||||||
|
|
@ -338,6 +338,7 @@ namespace LY.App.Device
|
||||||
{
|
{
|
||||||
int retryDelay = 1000; // 初始重连间隔(1秒)
|
int retryDelay = 1000; // 初始重连间隔(1秒)
|
||||||
int maxDelay = 30000; // 最大重连间隔(30秒)
|
int maxDelay = 30000; // 最大重连间隔(30秒)
|
||||||
|
var _log = ServiceLocator.Instance.GetService<LogService>();
|
||||||
await _log?.AddLog(new AddLog { Message = $"设备 {device.Id} 掉线,重新连接中...", Parameters = "", StackTrace = "", url = "" });
|
await _log?.AddLog(new AddLog { Message = $"设备 {device.Id} 掉线,重新连接中...", Parameters = "", StackTrace = "", url = "" });
|
||||||
while (!device.IsConnected)
|
while (!device.IsConnected)
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -9,18 +9,25 @@ using SqlSugar;
|
||||||
|
|
||||||
namespace LY.App.Service
|
namespace LY.App.Service
|
||||||
{
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// 设备服务
|
||||||
|
/// </summary>
|
||||||
[ServiceInjection(InjectionType.Transient)]
|
[ServiceInjection(InjectionType.Transient)]
|
||||||
public class DeviceService
|
public class DeviceService
|
||||||
{
|
{
|
||||||
private readonly SqlSugarClient _db;
|
private readonly SqlSugarClient _db;
|
||||||
private readonly IConfiguration _config;
|
|
||||||
private readonly RedisService _redisService;
|
private readonly RedisService _redisService;
|
||||||
private readonly AlarmService _alarmService;
|
private readonly AlarmService _alarmService;
|
||||||
private readonly DeviceManager deviceManager = DeviceManager.Instance;
|
private readonly DeviceManager deviceManager = DeviceManager.Instance;
|
||||||
public DeviceService(SqlSugarClient db, IConfiguration config, RedisService redisService, AlarmService alarmService)
|
/// <summary>
|
||||||
|
/// 构造函数
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="db"></param>
|
||||||
|
/// <param name="redisService"></param>
|
||||||
|
/// <param name="alarmService"></param>
|
||||||
|
public DeviceService(SqlSugarClient db, RedisService redisService, AlarmService alarmService)
|
||||||
{
|
{
|
||||||
_db = db;
|
_db = db;
|
||||||
_config = config;
|
|
||||||
_redisService = redisService;
|
_redisService = redisService;
|
||||||
_alarmService = alarmService;
|
_alarmService = alarmService;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -9,7 +9,7 @@ using System.Text;
|
||||||
|
|
||||||
namespace LY.App.Service
|
namespace LY.App.Service
|
||||||
{
|
{
|
||||||
[ServiceInjection(InjectionType.Singleton)]
|
[ServiceInjection(InjectionType.Transient)]
|
||||||
public class LogService
|
public class LogService
|
||||||
{
|
{
|
||||||
private readonly SqlSugarClient _db;
|
private readonly SqlSugarClient _db;
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue