Skip to content

2025.2 Maintenance Release #427

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nblumhardt merged 2 commits into from
Aug 5, 2025
Merged

2025.2 Maintenance Release #427

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3754df2
Remove console writes and unused code in SeqCli.Forwarder.Util.Servic…
nblumhardt Aug 5, 2025
8f05e34
Merge pull request #426 from nblumhardt/remove-console-writeline
nblumhardt Aug 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
113 changes: 38 additions & 75 deletions src/SeqCli/Forwarder/Util/ServiceConfiguration.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,93 +16,56 @@
using System.Diagnostics.CodeAnalysis;
using System.IO;
using System.Linq;
using System.ServiceProcess;
using System.Text;
using SeqCli.Forwarder.Util;
using Serilog;

namespace SeqCli.Forwarder.Util
namespace SeqCli.Forwarder.Util;

[SuppressMessage("Interoperability", "CA1416:Validate platform compatibility")]
public static class ServiceConfiguration
{
[SuppressMessage("Interoperability", "CA1416:Validate platform compatibility")]
public static class ServiceConfiguration
static bool GetServiceCommandLine(string serviceName, [MaybeNullWhen(false)] out string path)
{
public static bool GetServiceBinaryPath(ServiceController controller, [MaybeNullWhen(false)] out string path)
{
var sc = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.System), "sc.exe");

var config = new StringBuilder();
if (0 != CaptiveProcess.Run(sc, "qc \"" + controller.ServiceName + "\"", l => config.AppendLine(l), Console.WriteLine))
{
Console.WriteLine("Could not query service path; ignoring.");
path = null;
return false;
}

var lines = config.ToString()
.Split(new[] { Environment.NewLine }, StringSplitOptions.RemoveEmptyEntries)
.Select(l => l.Trim());

var line = lines
.SingleOrDefault(l => l.StartsWith("BINARY_PATH_NAME : "));

if (line == null)
{
Console.WriteLine("No existing binary path could be determined.");
path = null;
return false;
}
var sc = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.System), "sc.exe");

path = line.Replace("BINARY_PATH_NAME : ", "");
return true;
}

static bool GetServiceCommandLine(string serviceName, [MaybeNullWhen(false)] out string path)
var config = new StringBuilder();
if (0 != CaptiveProcess.Run(sc, "qc \"" + serviceName + "\"", l => config.AppendLine(l), Console.WriteLine))
{
if (serviceName == null) throw new ArgumentNullException(nameof(serviceName));

var sc = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.System), "sc.exe");
Log.Debug("Could not query service path; ignoring.");
path = null;
return false;
}

var config = new StringBuilder();
if (0 != CaptiveProcess.Run(sc, "qc \"" + serviceName + "\"", l => config.AppendLine(l), Console.WriteLine))
{
Console.WriteLine("Could not query service path; ignoring.");
path = null;
return false;
}
var lines = config.ToString()
.Split([Environment.NewLine], StringSplitOptions.RemoveEmptyEntries)
.Select(l => l.Trim());

var lines = config.ToString()
.Split(new[] { Environment.NewLine }, StringSplitOptions.RemoveEmptyEntries)
.Select(l => l.Trim());
var line = lines
.SingleOrDefault(l => l.StartsWith("BINARY_PATH_NAME : "));

var line = lines
.SingleOrDefault(l => l.StartsWith("BINARY_PATH_NAME : "));
if (line == null)
{
Log.Debug("No existing binary path could be determined.");
path = null;
return false;
}

if (line == null)
{
Console.WriteLine("No existing binary path could be determined.");
path = null;
return false;
}
path = line.Replace("BINARY_PATH_NAME : ", "");
return true;
}

path = line.Replace("BINARY_PATH_NAME : ", "");
public static bool GetServiceStoragePath(string serviceName, out string? storage)
{
if (GetServiceCommandLine(serviceName, out var binpath) &&
binpath.Contains("--storage=\""))
{
var start = binpath.IndexOf("--storage=\"", StringComparison.Ordinal) + 11;
var chop = binpath.Substring(start);
storage = chop.Substring(0, chop.IndexOf('"'));
return true;
}

public static bool GetServiceStoragePath(string serviceName, out string? storage)
{
if (serviceName == null) throw new ArgumentNullException(nameof(serviceName));

if (GetServiceCommandLine(serviceName, out var binpath) &&
binpath.Contains("--storage=\""))
{
var start = binpath.IndexOf("--storage=\"", StringComparison.Ordinal) + 11;
var chop = binpath.Substring(start);
storage = chop.Substring(0, chop.IndexOf('"'));
return true;
}

storage = null;
return false;
}
storage = null;
return false;
}
}

}
Loading