relms/netsd
Archived
0
0
Fork 0
Code Activity

add basic logging and process logs

Browse source
This commit is contained in:
Daryl Ronningen 2022-11-18 01:33:42 -08:00
parent 308b46c26a
commit 50b682c875
Signed by: Daryl Ronningen
GPG key ID: FD23F0C934A5EC6B
5 changed files with 56 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
netsd/Handlers/Init.cs
View file

@ -6,24 +6,34 @@ using Microsoft.AspNetCore.Server.Kestrel.Core;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Logging;
using netsd.Utils;
using Serilog;
using Serilog.Core;
using Serilog.Events;
using StartGrpc;
namespace netsd.Handlers;
public class Init
{
public static readonly Logger Logger = new LoggerConfiguration()
.MinimumLevel.Debug()
.MinimumLevel.Override("Microsoft", LogEventLevel.Information)
.Enrich.FromLogContext()
.WriteTo.Console(outputTemplate: "[{Timestamp:HH:mm:ss} {Level:u3}] {Message:lj}{NewLine}{Exception}")
.CreateLogger();
private readonly WebApplicationBuilder _socketBuilder = WebApplication.CreateBuilder();
public Init()
{
_socketBuilder.WebHost.ConfigureKestrel(options =>
{
options.ListenUnixSocket("/tmp/netsd.sock", listenOptions =>
{
listenOptions.Protocols = HttpProtocols.Http2;
});
options.ListenUnixSocket("/tmp/netsd.sock",
listenOptions => { listenOptions.Protocols = HttpProtocols.Http2; });
});
_socketBuilder.Host.UseSerilog(Logger);
_socketBuilder.Logging.ClearProviders();
_socketBuilder.Services.AddGrpc();
@ -38,25 +48,34 @@ public class Init
public class StartGrpc : StartRpc.StartRpcBase
{
public override async Task<StartReply> StartService(StartRequest request, ServerCallContext context)
public override async Task StartService(StartRequest request, IServerStreamWriter<StartReply> responseStream,
ServerCallContext context)
{
Init.Logger.Information($"Received request to start service {Path.GetFileName(request.Path)}.");
var parseServiceFile = await ServiceParser.Parse(request.Path);
using var startService = new Process();
startService.StartInfo.CreateNoWindow = true;
startService.StartInfo.FileName = parseServiceFile.ExecStart?.Split(' ').First();
startService.StartInfo.Arguments = string.Join(" ", parseServiceFile.ExecStart?.Split(' ').Skip(1)!);
startService.StartInfo.UseShellExecute = false;
startService.StartInfo.RedirectStandardOutput = true;
startService.StartInfo.RedirectStandardError = true;
startService.EnableRaisingEvents = true;
startService.Start();
startService.OutputDataReceived += (sender, args) => Init.Logger.Information(args.Data!);
startService.ErrorDataReceived += (sender, args) => Init.Logger.Error(args.Data!);
startService.OutputDataReceived += (sender, args) =>
{
Console.WriteLine(args);
};
if (!startService.Start())
throw new Exception("Process failed to start");
return new StartReply
{
Success = true,
};
startService.BeginOutputReadLine();
startService.BeginErrorReadLine();
Init.Logger.Information($"Started service {Path.GetFileName(request.Path)}.");
await responseStream.WriteAsync(new StartReply { Success = true });
await startService.WaitForExitAsync();
}
}

14
netsd/Handlers/Start.cs
View file

@ -1,3 +1,4 @@
using Grpc.Core;
using netsd.Utils;
using StartGrpc;
@ -5,7 +6,7 @@ namespace netsd.Handlers;
public class Start
{
public Start(string? ServiceFilePath = null, string? ServiceName = null)
public async Task StartAsync(string? ServiceFilePath = null, string? ServiceName = null)
{
if (ServiceFilePath == null && ServiceName != null)
{
@ -24,6 +25,15 @@ public class Start
var client = new StartRpc.StartRpcClient(channel);
var reply = client.StartService(new StartRequest{ Path = ServiceFilePath });
Console.WriteLine(reply.Success);
while (await reply.ResponseStream.MoveNext())
{
var current = reply.ResponseStream.Current;
Console.WriteLine($"{current.Success}");
if (!current.Success) continue;
Environment.Exit(0);
break;
}
}
}

6
netsd/Program.cs
View file

@ -19,15 +19,15 @@ rootCommand.AddCommand(startCommand);
initCommand.SetHandler(() => new Init());
startCommand.SetHandler((file, name) =>
startCommand.SetHandler(async (file, name) =>
{
if (name.Length != 0)
{
new Start(ServiceName: name);
await new Start().StartAsync(ServiceName: name);
}
else
{
new Start(ServiceFilePath: file.FullName);
await new Start().StartAsync(ServiceFilePath: file.FullName);
}
}, startServicePath, startServiceName);

5
netsd/Protos/Start.proto
View file

@ -5,13 +5,14 @@ option csharp_namespace = "StartGrpc";
package netsd;
service StartRpc {
rpc StartService (StartRequest) returns (StartReply);
rpc StartService (StartRequest) returns (stream StartReply);
}
message StartRequest {
string path = 1;
string Path = 1;
}
message StartReply {
bool Success = 1;
optional string Error = 2;
}

5
netsd/netsd.csproj
View file

@ -32,10 +32,13 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Grpc.AspNetCore" Version="2.50.0-pre1" />
<PackageReference Include="Grpc.AspNetCore" Version="2.50.0" />
<PackageReference Include="ini-parser" Version="3.4.0" />
<PackageReference Include="runtime.linux-musl-x64.Microsoft.DotNet.ILCompiler" Version="7.0.0" />
<PackageReference Include="runtime.linux-x64.Microsoft.DotNet.ILCompiler" Version="7.0.0" />
<PackageReference Include="Serilog" Version="2.12.0" />
<PackageReference Include="Serilog.AspNetCore" Version="6.0.1" />
<PackageReference Include="Serilog.Sinks.Console" Version="4.1.0" />
<PackageReference Include="System.CommandLine" Version="2.0.0-beta4.22272.1" />
</ItemGroup>