Skip to content

Commit e5dea44

Browse files
committed
Fix log level filter error for PostgreSQL.
1 parent 1cb188b commit e5dea44

File tree

4 files changed

+62
-37
lines changed

4 files changed

+62
-37
lines changed
Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
namespace Serilog.Ui.PostgreSqlProvider
2+
{
3+
internal class LogLevelConverter
4+
{
5+
public static string GetLevelName(string value)
6+
{
7+
switch (value)
8+
{
9+
case "0":
10+
return "Verbose";
11+
12+
case "1":
13+
return "Debug";
14+
15+
case "2":
16+
return "Information";
17+
18+
case "3":
19+
return "Warning";
20+
21+
case "4":
22+
return "Error";
23+
24+
default:
25+
return "";
26+
}
27+
}
28+
29+
public static int GetLevelValue(string name)
30+
{
31+
switch (name)
32+
{
33+
case "Verbose":
34+
return 0;
35+
36+
case "Debug":
37+
return 1;
38+
39+
case "Information":
40+
return 2;
41+
42+
case "Warning":
43+
return 3;
44+
45+
case "Error":
46+
return 4;
47+
48+
default:
49+
return 100;
50+
}
51+
}
52+
}
53+
}

src/Serilog.Ui.PostgreSqlProvider/PostgreDataProvider.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
using System.Collections.Generic;
1+
using Dapper;
2+
using Npgsql;
3+
using Serilog.Ui.Core;
4+
using System.Collections.Generic;
25
using System.Data;
36
using System.Text;
47
using System.Threading.Tasks;
5-
using Dapper;
6-
using Npgsql;
7-
using Serilog.Ui.Core;
88

99
namespace Serilog.Ui.PostgreSqlProvider
1010
{
@@ -63,7 +63,7 @@ private async Task<IEnumerable<LogModel>> GetLogsAsync(int page, int count, stri
6363
{
6464
Offset = page,
6565
Count = count,
66-
Level = level,
66+
Level = LogLevelConverter.GetLevelValue(level),
6767
Search = searchCriteria != null ? "%" + searchCriteria + "%" : null
6868
});
6969
}
@@ -95,7 +95,7 @@ public async Task<int> CountLogsAsync(string level, string searchCriteria)
9595
return await connection.ExecuteScalarAsync<int>(queryBuilder.ToString(),
9696
new
9797
{
98-
Level = level,
98+
Level = LogLevelConverter.GetLevelValue(level),
9999
Search = searchCriteria != null ? "%" + searchCriteria + "%" : null
100100
});
101101
}

src/Serilog.Ui.PostgreSqlProvider/PostgreLogModel.cs

Lines changed: 1 addition & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -9,35 +9,7 @@ internal class PostgresLogModel : LogModel
99
public override string Level
1010
{
1111
get => _level;
12-
set
13-
{
14-
switch (value)
15-
{
16-
case "0":
17-
_level = "Verbose";
18-
break;
19-
20-
case "1":
21-
_level = "Debug";
22-
break;
23-
24-
case "2":
25-
_level = "Information";
26-
break;
27-
28-
case "3":
29-
_level = "Warning";
30-
break;
31-
32-
case "4":
33-
_level = "Error";
34-
break;
35-
36-
default:
37-
_level = "";
38-
break;
39-
}
40-
}
12+
set => _level = LogLevelConverter.GetLevelName(value);
4113
}
4214
}
4315
}

src/Serilog.Ui.PostgreSqlProvider/Serilog.Ui.PostgreSqlProvider.nuspec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
33
<metadata>
4-
<id>Serilog.Ui.PostgresSqlProvider</id>
4+
<id>Serilog.Ui.PostgreSqlProvider</id>
55
<version>$version$</version>
6-
<title>Serilog.UI.PostgresSqlProvider</title>
6+
<title>Serilog.UI.PostgreSqlProvider</title>
77
<authors>Mohsen Esmailpour</authors>
88
<owners>mo.esmp</owners>
99
<projectUrl>https://github.com/mo-esmp/serilog-ui</projectUrl>

0 commit comments

Comments
 (0)