dc9c0c950c
Apply the ZB.MOM.WW. prefix to all gateway-side projects, folders,
.csproj/.sln contents, C# namespaces, using directives, generated proto
C# (csharp_namespace + checked-in generated files), InternalsVisibleTo
attributes, project-name string literals (LoadProject, .sln lookups,
worker exe paths, staticwebassets manifest), and the install/script/doc
references that point at any of the above. Migrate the solution from
.sln to .slnx via `dotnet sln migrate` and delete the old file.
External-runtime identifiers are intentionally NOT prefixed so external
configuration keeps working:
- GatewayMetrics.cs MeterName ("MxGateway.Server")
- DashboardAuthenticationDefaults Scheme/Policy ("MxGateway.Dashboard")
- GatewayRequestLoggingMiddleware logger category ("MxGateway.Request")
- StaRuntime thread name ("MxGateway.Worker.STA")
- appsettings.json root section "MxGateway" + env-var prefix
MxGateway__... and secret-name MxGateway:ApiKeyPepper
- C:\ProgramData\MxGateway\ data dir paths
Also fixes two tests that were not rename-related but became visible
while validating the rename:
- WorkerLiveMxAccessSmokeTests.ShutDownAsync: cancellation that the
gateway service correctly maps to RpcException(Cancelled) per gRPC
convention was being misclassified as a stream fault. Added a sibling
catch on RpcException with StatusCode.Cancelled.
- IntegrationTestEnvironment.ResolveRepositoryRoot: extracted IsRepositoryRoot
and made it accept either a .git marker OR a .sln/.slnx next to src/
so the worker-exe walker works in non-git working copies.
clients/proto/proto-inputs.json's protoRoot updated to point at
src/ZB.MOM.WW.MxGateway.Contracts/Protos.
Verified by `dotnet build` and a full `dotnet test` of the .slnx with
MXGATEWAY_RUN_LIVE_{MXACCESS,LDAP,GALAXY}_TESTS=1:
Tests: 472/472 pass
Worker.Tests: 280/280 pass (4 dev-rig [Fact(Skip=...)] skipped)
IntegrationTests: 18/18 pass
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
140 lines
4.8 KiB
C#
140 lines
4.8 KiB
C#
using System;
|
|
using System.Collections.Generic;
|
|
using System.IO;
|
|
using ZB.MOM.WW.MxGateway.Worker.Bootstrap;
|
|
using ZB.MOM.WW.MxGateway.Worker.Ipc;
|
|
|
|
namespace ZB.MOM.WW.MxGateway.Worker;
|
|
|
|
/// <summary>Entry point for the worker process.</summary>
|
|
public static class WorkerApplication
|
|
{
|
|
/// <summary>Initializes and runs the worker with default environment and logging.</summary>
|
|
/// <param name="args">Command-line arguments.</param>
|
|
public static int Run(string[] args)
|
|
{
|
|
return Run(
|
|
args,
|
|
new EnvironmentVariableWorkerEnvironment(),
|
|
new WorkerConsoleLogger(Console.Error));
|
|
}
|
|
|
|
/// <summary>Initializes and runs the worker with custom environment and logging.</summary>
|
|
/// <param name="args">Command-line arguments.</param>
|
|
/// <param name="environment">Worker environment for resolving configuration.</param>
|
|
/// <param name="logger">Worker logger for diagnostics.</param>
|
|
public static int Run(
|
|
string[] args,
|
|
IWorkerEnvironment environment,
|
|
IWorkerLogger logger)
|
|
{
|
|
return Run(
|
|
args,
|
|
environment,
|
|
logger,
|
|
new WorkerPipeClient(logger));
|
|
}
|
|
|
|
/// <summary>Parses arguments, bootstraps the handshake, and runs the worker until shutdown.</summary>
|
|
/// <param name="args">Command-line arguments.</param>
|
|
/// <param name="environment">Worker environment for resolving configuration.</param>
|
|
/// <param name="logger">Worker logger for diagnostics.</param>
|
|
/// <param name="pipeClient">Named pipe client for gateway communication.</param>
|
|
public static int Run(
|
|
string[] args,
|
|
IWorkerEnvironment environment,
|
|
IWorkerLogger logger,
|
|
IWorkerPipeClient pipeClient)
|
|
{
|
|
if (args is null)
|
|
{
|
|
throw new ArgumentNullException(nameof(args));
|
|
}
|
|
|
|
if (environment is null)
|
|
{
|
|
throw new ArgumentNullException(nameof(environment));
|
|
}
|
|
|
|
if (logger is null)
|
|
{
|
|
throw new ArgumentNullException(nameof(logger));
|
|
}
|
|
|
|
if (pipeClient is null)
|
|
{
|
|
throw new ArgumentNullException(nameof(pipeClient));
|
|
}
|
|
|
|
try
|
|
{
|
|
WorkerOptionsParser parser = new(environment);
|
|
WorkerBootstrapResult result = parser.Parse(args);
|
|
|
|
if (!result.Succeeded)
|
|
{
|
|
logger.Error("WorkerBootstrapFailed", new Dictionary<string, object?>
|
|
{
|
|
["exit_code"] = result.ExitCode,
|
|
["errors"] = string.Join(";", result.Errors),
|
|
});
|
|
|
|
return (int)result.ExitCode;
|
|
}
|
|
|
|
WorkerOptions options = result.Options
|
|
?? throw new InvalidOperationException("Successful bootstrap result did not include worker options.");
|
|
|
|
logger.Information("WorkerBootstrapSucceeded", new Dictionary<string, object?>
|
|
{
|
|
["session_id"] = options.SessionId,
|
|
["pipe_name"] = options.PipeName,
|
|
["protocol_version"] = options.ProtocolVersion,
|
|
["nonce"] = options.Nonce,
|
|
});
|
|
|
|
pipeClient.RunAsync(options).GetAwaiter().GetResult();
|
|
|
|
logger.Information("WorkerPipeSessionCompleted", new Dictionary<string, object?>
|
|
{
|
|
["session_id"] = options.SessionId,
|
|
["pipe_name"] = options.PipeName,
|
|
["protocol_version"] = options.ProtocolVersion,
|
|
});
|
|
|
|
return (int)WorkerExitCode.Success;
|
|
}
|
|
catch (WorkerFrameProtocolException exception)
|
|
{
|
|
logger.Error("WorkerPipeProtocolFailure", new Dictionary<string, object?>
|
|
{
|
|
["exit_code"] = WorkerExitCode.ProtocolViolation,
|
|
["error_code"] = exception.ErrorCode,
|
|
["exception_type"] = exception.GetType().FullName,
|
|
});
|
|
|
|
return (int)WorkerExitCode.ProtocolViolation;
|
|
}
|
|
catch (Exception exception) when (exception is IOException or TimeoutException)
|
|
{
|
|
logger.Error("WorkerPipeConnectionFailed", new Dictionary<string, object?>
|
|
{
|
|
["exit_code"] = WorkerExitCode.PipeConnectionFailed,
|
|
["exception_type"] = exception.GetType().FullName,
|
|
});
|
|
|
|
return (int)WorkerExitCode.PipeConnectionFailed;
|
|
}
|
|
catch (Exception exception)
|
|
{
|
|
logger.Error("WorkerBootstrapUnexpectedFailure", new Dictionary<string, object?>
|
|
{
|
|
["exit_code"] = WorkerExitCode.UnexpectedFailure,
|
|
["exception_type"] = exception.GetType().FullName,
|
|
});
|
|
|
|
return (int)WorkerExitCode.UnexpectedFailure;
|
|
}
|
|
}
|
|
}
|