Skip to content

Commit 1356421

Browse files
authored
add log level overwrite and fix null error (#147)
1 parent a8f73fa commit 1356421

File tree

2 files changed

+17
-2
lines changed

2 files changed

+17
-2
lines changed

src/Core/ContainerResourceBuilder.cs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -414,6 +414,12 @@ public ContainerResourceBuilder WithLogLevel(SourceLevels level)
414414
/// <returns></returns>
415415
public virtual ContainerResourceSettings Build()
416416
{
417+
var logLevel = Environment.GetEnvironmentVariable("SQUADRON_LOG_LEVEL");
418+
if (Enum.TryParse(logLevel, true, out SourceLevels overriddenLogLevel))
419+
{
420+
_logLevel = overriddenLogLevel;
421+
}
422+
417423
_options.DockerConfigResolver ??= ContainerResourceOptions.DefaultDockerConfigResolver;
418424
_options.Logger = new Logger(_logLevel, _options);
419425
_options.Cmd = _cmd;

src/Core/DockerContainerManager.cs

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -729,9 +729,18 @@ private Task Retry(Func<Task> execute)
729729
private async Task RetryAction(Exception exception, TimeSpan t, int retryCount, Context c)
730730
{
731731
_settings.Logger.Warning($"Docker command failed {retryCount}. {exception.Message}");
732+
732733
SystemInfoResponse? systemInfo = await Client.System.GetSystemInfoAsync();
733-
_settings.Logger.Warning($"Driver status: {string.Join(", ", systemInfo.DriverStatus)}");
734-
_settings.Logger.Warning($"System status: {string.Join(", ", systemInfo.SystemStatus)}");
734+
735+
if (systemInfo is { DriverStatus: { Count: > 0 } })
736+
{
737+
_settings.Logger.Warning($"Driver status: {string.Join(", ", systemInfo.DriverStatus)}");
738+
}
739+
740+
if (systemInfo is { SystemStatus: { Count: > 0 } })
741+
{
742+
_settings.Logger.Warning($"System status: {string.Join(", ", systemInfo.SystemStatus)}");
743+
}
735744
}
736745

737746
public void Dispose()

0 commit comments

Comments
 (0)