Skip to content

Commit 350cb1a

Browse files
dev: added NLog formatted logging
1 parent 1d5719e commit 350cb1a

File tree

6 files changed

+34
-7
lines changed

6 files changed

+34
-7
lines changed
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
22
"ConnectionStrings": {
3-
"ServerlessYDB": "UseTls=true;Host=ydb.serverless.yandexcloud.net;Port=2135;Database=/ru-central1/b1g8skpblkos03malf3s/etnl7uv72neobbgiahii"
3+
"ServerlessYDB": "UseTls=true;Host=<host>;Port=2135;Database=<database>"
44
}
55
}

slo/playground/configs/chaos.sh

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ echo "Start CHAOS YDB cluster!"
2424

2525
for i in $(seq 1 5)
2626
do
27-
echo "docker stop/start iteration $i"
27+
echo "[$(date)]: docker stop/start iteration $i"
2828

2929
get_random_container
3030

@@ -36,7 +36,7 @@ done
3636

3737
for i in $(seq 1 3)
3838
do
39-
echo "docker restart iteration $i"
39+
echo "[$(date)]: docker restart iteration $i"
4040

4141
get_random_container
4242

@@ -47,4 +47,6 @@ done
4747

4848
get_random_container
4949

50+
echo "[$(date)]: docker kill -s SIGKILL ${nodeForChaos}"
51+
5052
sh -c "docker kill -s SIGKILL ${nodeForChaos}"

slo/playground/configs/ydb.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,11 @@ blob_storage_config:
1515
- node_id: 1
1616
path: SectorMap:1:64
1717
pdisk_category: SSD
18+
# enable grpc server logs
19+
#log_config:
20+
# entry:
21+
# - component: GRPC_SERVER
22+
# level: 8
1823
channel_profile_config:
1924
profile:
2025
- channel:

slo/src/Internal/Internal.csproj

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,13 @@
1010

1111
<ItemGroup>
1212
<ProjectReference Include="..\..\..\src\Ydb.Sdk\src\Ydb.Sdk.csproj"/>
13+
<None Update="nlog.config">
14+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
15+
</None>
1316
</ItemGroup>
1417

1518
<ItemGroup>
16-
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="7.0.0"/>
19+
<PackageReference Include="NLog.Extensions.Logging" Version="5.5.0"/>
1720
<PackageReference Include="prometheus-net" Version="8.0.1"/>
1821
<PackageReference Include="System.CommandLine" Version="2.0.0-beta4.22272.1"/>
1922
<PackageReference Include="System.Threading.RateLimiting" Version="8.0.0" />

slo/src/Internal/SloTableContext.cs

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
using System.Security.Cryptography;
33
using System.Threading.RateLimiting;
44
using Microsoft.Extensions.Logging;
5+
using NLog.Extensions.Logging;
56
using Prometheus;
67
using Ydb.Sdk;
78

@@ -13,9 +14,10 @@ public interface ISloContext
1314
public static readonly ILoggerFactory Factory =
1415
LoggerFactory.Create(builder =>
1516
{
16-
builder.AddConsole().SetMinimumLevel(LogLevel.Information);
17-
builder.AddFilter("Ydb.Sdk.Ado", LogLevel.Debug);
18-
builder.AddFilter("Ydb.Sdk.Services.Query", LogLevel.Debug);
17+
builder.AddNLog()
18+
.SetMinimumLevel(LogLevel.Information)
19+
.AddFilter("Ydb.Sdk.Ado", LogLevel.Debug)
20+
.AddFilter("Ydb.Sdk.Services.Query", LogLevel.Debug);
1921
});
2022

2123

slo/src/Internal/nlog.config

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
3+
<nlog xmlns="http://www.nlog-project.org/schemas/NLog.xsd"
4+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
5+
6+
<targets>
7+
<target xsi:type="Console" name="ConsoleTarget"
8+
layout="${longdate} ${level:uppercase=true} ${logger} - ${message}${onexception:${newline}${exception:format=ToString}}">
9+
</target>
10+
</targets>
11+
12+
<rules>
13+
<logger name="*" minlevel="Info" writeTo="ConsoleTarget" />
14+
</rules>
15+
</nlog>

0 commit comments

Comments
 (0)