Skip to content

Improve logs and config autocompletion #9159

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
flcl42 merged 4 commits into from
Aug 18, 2025
Merged

Improve logs and config autocompletion #9159

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
412ec23
Flatten log level
flcl42 Aug 18, 2025
1062c30
Fix schema generator deps; include more stuff for configs autocompletion
flcl42 Aug 18, 2025
afe63a6
Add logs for IPC server
flcl42 Aug 14, 2025
ce5a07b
.
flcl42 Aug 18, 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
2 changes: 1 addition & 1 deletion src/Nethermind/Nethermind.Network.Discovery/Discv5/DiscoveryV5App.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ .. _discoveryDb.GetAllValues().Select(enr =>
.WithTableOptions(new TableOptions(bootstrapEnrs.Select(enr => enr.ToString()).ToArray()))
.WithEnrBuilder(enrBuilder)
.WithTalkResponder(new TalkReqAndRespHandler())
.WithLoggerFactory(new NethermindLoggerFactory(logManager, true))
.WithLoggerFactory(new NethermindLoggerFactory(logManager, true, Microsoft.Extensions.Logging.LogLevel.Debug))
.WithServices(s =>
{
s.AddSingleton(logManager);
Expand Down
16 changes: 9 additions & 7 deletions src/Nethermind/Nethermind.Network.Discovery/Discv5/NethermindLoggerFactory.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,26 +7,26 @@

namespace Nethermind.Network.Discovery;

public sealed class NethermindLoggerFactory(ILogManager logManager, bool lowerLogLevel = false) : ILoggerFactory
public sealed class NethermindLoggerFactory(ILogManager logManager, bool lowerLogLevel = false, MsLogLevel? maxLogLevel = null) : ILoggerFactory
{
public Microsoft.Extensions.Logging.ILogger CreateLogger(string categoryName)
{
return new NethermindLogger(logManager.GetLogger(categoryName), lowerLogLevel);
return new NethermindLogger(logManager.GetLogger(categoryName), lowerLogLevel, maxLogLevel);
}

public void Dispose() { }

public void AddProvider(ILoggerProvider provider) { }

class NethermindLogger(Logging.ILogger logger, bool lowerLogLevel = false) : Microsoft.Extensions.Logging.ILogger
class NethermindLogger(Logging.ILogger logger, bool lowerLogLevel = false, MsLogLevel? maxLogLevel = null) : Microsoft.Extensions.Logging.ILogger
{
public IDisposable? BeginScope<TState>(TState state) where TState : notnull => null;

public bool IsEnabled(MsLogLevel logLevel)
{
if (lowerLogLevel)
{
logLevel = LowerLogLevel(logLevel);
logLevel = LowerLogLevel(logLevel, maxLogLevel);
}

return logLevel switch
Expand All @@ -45,7 +45,7 @@ public void Log<TState>(MsLogLevel logLevel, EventId eventId,
{
if (lowerLogLevel)
{
logLevel = LowerLogLevel(logLevel);
logLevel = LowerLogLevel(logLevel, maxLogLevel);
}

switch (logLevel)
Expand Down Expand Up @@ -74,10 +74,10 @@ public void Log<TState>(MsLogLevel logLevel, EventId eventId,
}
}

private static MsLogLevel LowerLogLevel(MsLogLevel logLevel)
private static MsLogLevel LowerLogLevel(MsLogLevel logLevel, MsLogLevel? maxLogLevel)
{
// DotNetty outputs Trace level data at Info
return logLevel switch
MsLogLevel loweredLogLevel = logLevel switch
{
MsLogLevel.Critical => MsLogLevel.Error,
MsLogLevel.Error => MsLogLevel.Warning,
Expand All @@ -86,6 +86,8 @@ private static MsLogLevel LowerLogLevel(MsLogLevel logLevel)
MsLogLevel.Debug => MsLogLevel.Trace,
_ => logLevel,
};

return loweredLogLevel > maxLogLevel ? maxLogLevel.Value : loweredLogLevel;
}
}
}
16 changes: 12 additions & 4 deletions src/Nethermind/Nethermind.Runner/JsonRpc/JsonRpcIpcRunner.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,11 +60,19 @@ public void Start(CancellationToken cancellationToken)

private async Task StartServer(string path, CancellationToken cancellationToken)
{
DeleteSocketFileIfExists(path);
try
{
DeleteSocketFileIfExists(path);

_server = new(AddressFamily.Unix, SocketType.Stream, ProtocolType.Unspecified);
_server.Bind(new UnixDomainSocketEndPoint(path));
_server.Listen(0);
_server = new(AddressFamily.Unix, SocketType.Stream, ProtocolType.Unspecified);
_server.Bind(new UnixDomainSocketEndPoint(path));
_server.Listen(0);
}
catch (Exception ex)
{
if (_logger.IsError) _logger.Error($"Failed to start IPC server at {path}.", ex);
return;
}

while (true)
{
Expand Down
6 changes: 5 additions & 1 deletion tools/SchemaGenerator/SchemaGenerator.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,20 @@
</PropertyGroup>

<ItemGroup>
<Compile Include="update.ps1" />
<Content Include="update.ps1" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="NJsonSchema" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\..\src\Nethermind\Nethermind.Analytics\Nethermind.Analytics.csproj" />
<ProjectReference Include="..\..\src\Nethermind\Nethermind.Flashbots\Nethermind.Flashbots.csproj" />
<ProjectReference Include="..\..\src\Nethermind\Nethermind.Hive\Nethermind.Hive.csproj" />
<ProjectReference Include="..\..\src\Nethermind\Nethermind.Api\Nethermind.Api.csproj" />
<ProjectReference Include="..\..\src\Nethermind\Nethermind.Init.Snapshot\Nethermind.Init.Snapshot.csproj" />
<ProjectReference Include="..\..\src\Nethermind\Nethermind.JsonRpc.TraceStore\Nethermind.JsonRpc.TraceStore.csproj" />
<ProjectReference Include="..\..\src\Nethermind\Nethermind.Optimism\Nethermind.Optimism.csproj" />
<ProjectReference Include="..\..\src\Nethermind\Nethermind.Shutter\Nethermind.Shutter.csproj" />
<ProjectReference Include="..\..\src\Nethermind\Nethermind.Consensus.AuRa\Nethermind.Consensus.AuRa.csproj" />
Expand Down
13 changes: 13 additions & 0 deletions tools/SchemaGenerator/SchemaGenerator.slnx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
<Solution>
<Project Path="../../src/Nethermind/Nethermind.History/Nethermind.History.csproj" />
<Project Path="../../src/Nethermind/Nethermind.Hive/Nethermind.Hive.csproj" />
<Project Path="../../src/Nethermind/Nethermind.Abi/Nethermind.Abi.csproj" />
<Project Path="../../src/Nethermind/Nethermind.Analytics/Nethermind.Analytics.csproj" />
<Project Path="../../src/Nethermind/Nethermind.Api/Nethermind.Api.csproj" />
<Project Path="../../src/Nethermind/Nethermind.Blockchain/Nethermind.Blockchain.csproj" />
<Project Path="../../src/Nethermind/Nethermind.Config/Nethermind.Config.csproj" />
Expand All @@ -10,15 +13,23 @@
<Project Path="../../src/Nethermind/Nethermind.Db.Rocks/Nethermind.Db.Rocks.csproj" />
<Project Path="../../src/Nethermind/Nethermind.Db.Rpc/Nethermind.Db.Rpc.csproj" />
<Project Path="../../src/Nethermind/Nethermind.Db/Nethermind.Db.csproj" />
<Project Path="../../src/Nethermind/Nethermind.Era1/Nethermind.Era1.csproj" />
<Project Path="../../src/Nethermind/Nethermind.EthStats/Nethermind.EthStats.csproj" />
<Project Path="../../src/Nethermind/Nethermind.Evm.Precompiles/Nethermind.Evm.Precompiles.csproj" />
<Project Path="../../src/Nethermind/Nethermind.Evm/Nethermind.Evm.csproj" />
<Project Path="../../src/Nethermind/Nethermind.Facade/Nethermind.Facade.csproj" />
<Project Path="../../src/Nethermind/Nethermind.Flashbots/Nethermind.Flashbots.csproj" />
<Project Path="../../src/Nethermind/Nethermind.Grpc/Nethermind.Grpc.csproj" />
<Project Path="../../src/Nethermind/Nethermind.Init.Snapshot/Nethermind.Init.Snapshot.csproj" />
<Project Path="../../src/Nethermind/Nethermind.Init/Nethermind.Init.csproj" />
<Project Path="../../src/Nethermind/Nethermind.JsonRpc.TraceStore/Nethermind.JsonRpc.TraceStore.csproj" />
<Project Path="../../src/Nethermind/Nethermind.JsonRpc/Nethermind.JsonRpc.csproj" />
<Project Path="../../src/Nethermind/Nethermind.KeyStore/Nethermind.KeyStore.csproj" />
<Project Path="../../src/Nethermind/Nethermind.Logging/Nethermind.Logging.csproj" />
<Project Path="../../src/Nethermind/Nethermind.Merge.Plugin/Nethermind.Merge.Plugin.csproj" />
<Project Path="../../src/Nethermind/Nethermind.Merkleization/Nethermind.Merkleization.csproj" />
<Project Path="../../src/Nethermind/Nethermind.Monitoring/Nethermind.Monitoring.csproj" />
<Project Path="../../src/Nethermind/Nethermind.Network.Contract/Nethermind.Network.Contract.csproj" />
<Project Path="../../src/Nethermind/Nethermind.Network.Discovery/Nethermind.Network.Discovery.csproj" />
<Project Path="../../src/Nethermind/Nethermind.Network.Dns/Nethermind.Network.Dns.csproj" />
<Project Path="../../src/Nethermind/Nethermind.Network.Enr/Nethermind.Network.Enr.csproj" />
Expand All @@ -27,12 +38,14 @@
<Project Path="../../src/Nethermind/Nethermind.Optimism/Nethermind.Optimism.csproj" />
<Project Path="../../src/Nethermind/Nethermind.Serialization.Json/Nethermind.Serialization.Json.csproj" />
<Project Path="../../src/Nethermind/Nethermind.Serialization.Rlp/Nethermind.Serialization.Rlp.csproj" />
<Project Path="../../src/Nethermind/Nethermind.Serialization.Ssz/Nethermind.Serialization.Ssz.csproj" />
<Project Path="../../src/Nethermind/Nethermind.Shutter/Nethermind.Shutter.csproj" />
<Project Path="../../src/Nethermind/Nethermind.Sockets/Nethermind.Sockets.csproj" />
<Project Path="../../src/Nethermind/Nethermind.Specs/Nethermind.Specs.csproj" />
<Project Path="../../src/Nethermind/Nethermind.State/Nethermind.State.csproj" />
<Project Path="../../src/Nethermind/Nethermind.Synchronization/Nethermind.Synchronization.csproj" />
<Project Path="../../src/Nethermind/Nethermind.Trie/Nethermind.Trie.csproj" />
<Project Path="../../src/Nethermind/Nethermind.TxPool/Nethermind.TxPool.csproj" />
<Project Path="../../src/Nethermind/Nethermind.Wallet/Nethermind.Wallet.csproj" />
<Project Path="SchemaGenerator.csproj" />
</Solution>