root/Ayay
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

规范并补充日志内容

Browse Source
This commit is contained in:
wilson
2026-01-16 14:30:42 +08:00
parent 4e0bb33ce2
commit fd6a82eb4e
28 changed files with 325 additions and 537 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
SHH.CameraService/GrpcImpls/Handlers/DeviceStatusHandler.cs
View File

@@ -1,7 +1,8 @@
using Grpc.Core;
using Ayay.SerilogLogs;
using Grpc.Core;
using Grpc.Net.Client;
using Microsoft.Extensions.Hosting;
using Microsoft.Extensions.Logging;
using Serilog;
using SHH.CameraSdk;
using SHH.Contracts;
using SHH.Contracts.Grpc;
@@ -10,14 +11,15 @@ using System.Collections.Concurrent;
namespace SHH.CameraService;
/// <summary>
/// 设备状态监控工作者 (gRPC 版)
/// 职责：监控相机状态并在状态变更或心跳周期内，通过 gRPC 批量上报至所有配置的端点
/// 设备状态监控工作者 (gRpc 版)
/// 职责：监控相机状态并在状态变更或心跳周期内，通过 gRpc 批量上报至所有配置的端点
/// </summary>
public class DeviceStatusHandler : BackgroundService
{
private static ILogger _gRpcLog = Log.ForContext("SourceContext", LogModules.gRpc);
private readonly CameraManager _manager;
private readonly ServiceConfig _config;
private readonly ILogger<DeviceStatusHandler> _logger;
// 状态存储：CameraId -> 状态载荷
private readonly ConcurrentDictionary<string, StatusEventPayload> _stateStore = new();
@@ -27,12 +29,10 @@ public class DeviceStatusHandler : BackgroundService
public DeviceStatusHandler(
CameraManager manager,
ServiceConfig config,
ILogger<DeviceStatusHandler> logger)
ServiceConfig config)
{
_manager = manager;
_config = config;
_logger = logger;
}
protected override async Task ExecuteAsync(CancellationToken stoppingToken)
@@ -46,7 +46,7 @@ public class DeviceStatusHandler : BackgroundService
// 2. 订阅 SDK 状态变更事件
_manager.OnDeviceStatusChanged += OnSdkStatusChanged;
_logger.LogInformation("[StatusWorker] gRPC 状态上报已启动，配置节点数: {Count}", _config.CommandEndpoints.Count);
_gRpcLog.Information($"[gRpc] 状态上报已启动，配置节点数: {_config.CommandEndpoints.Count}");
// 3. 定时循环 (1秒1次检查)
var timer = new PeriodicTimer(TimeSpan.FromSeconds(1));
@@ -60,7 +60,7 @@ public class DeviceStatusHandler : BackgroundService
catch (OperationCanceledException) { /* 正常退出 */ }
catch (Exception ex)
{
_logger.LogError(ex, "[StatusWorker] 运行异常");
_gRpcLog.Error($"[gRpc] 状态上报运行异常");
}
finally
{
@@ -96,12 +96,12 @@ public class DeviceStatusHandler : BackgroundService
{
long now = Environment.TickCount64;
// 策略: 有变更(Dirty) 或 超过5秒(强制心跳)
bool shouldSend = _isDirty || (now - _lastSendTick > 5000);
// 策略: 有变更(Dirty) 或 超过 2 秒(强制心跳)
bool shouldSend = _isDirty || (now - _lastSendTick > 2000);
if (shouldSend && _config.CommandEndpoints.Any())
{
// 1. 构建 gRPC 请求包
// 1. 构建 gRpc 请求包
var request = new StatusBatchRequest
{
Timestamp = DateTimeOffset.UtcNow.ToUnixTimeMilliseconds()
@@ -129,13 +129,12 @@ public class DeviceStatusHandler : BackgroundService
using var channel = GrpcChannel.ForAddress(grpcUrl);
var client = new GatewayProvider.GatewayProviderClient(channel);
// 获取 gRPC 内部生成的服务全称
// 获取 gRpc 内部生成的服务全称
// 这就是客户端尝试调用的真实路径：/包名.服务名/方法名
var methodName = "ReportStatusBatch";
var serviceName = client.GetType().DeclaringType?.Name ?? "Unknown";
_logger.LogInformation("[gRPC Debug] 准备调用端点: {Url}", grpcUrl);
_logger.LogInformation("[gRPC Debug] 客户端契约服务名: {Service}", serviceName);
_gRpcLog.Debug("[gRpc] 准备调用端点: {Url}", grpcUrl);
_gRpcLog.Debug("[gRpc] 客户端契约服务名: {Service}", serviceName);
// 执行调用
var response = await client.ReportStatusBatchAsync(request,
@@ -143,7 +142,8 @@ public class DeviceStatusHandler : BackgroundService
if (response.Success)
{
_logger.LogInformation("[gRPC Success] 上报成功");
_gRpcLog.Information("[gRpc] 设备状态上报成功, 共计: {Count} 个, Url: {Url}", request.Items.Count, grpcUrl);
_gRpcLog.Debug("[gRpc] 设备状态上报成功: {Url} Items:{Items}", grpcUrl, request.Items);
_isDirty = false;
_lastSendTick = Environment.TickCount64;
}
@@ -151,17 +151,17 @@ public class DeviceStatusHandler : BackgroundService
catch (RpcException ex)
{
// 这里是关键：打印 RpcException 的详细状态
_logger.LogError("[gRPC Error] StatusCode: {Code}, Detail: {Detail}", ex.StatusCode, ex.Status.Detail);
_gRpcLog.Error("[gRpc] StatusCode: {Code}, Detail: {Detail}", ex.StatusCode, ex.Status.Detail);
// 如果是 Unimplemented，通常意味着路径不对
if (ex.StatusCode == StatusCode.Unimplemented)
{
_logger.LogError("[gRPC Fix] 请检查服务端是否注册了名为 'GatewayProvider' 的服务，且其 package 声明与客户端一致。");
_gRpcLog.Error("[gRpc] 请检查服务端是否注册了名为 'GatewayProvider' 的服务，且其 package 声明与客户端一致。");
}
}
catch (Exception ex)
{
_logger.LogError("[gRPC Fatal] 非 RPC 异常: {Msg}", ex.Message);
_gRpcLog.Error("[gRpc] 非 RPC 异常: {Msg}", ex.Message);
}
}
}