Skip to content

Commit 9fffb1d

Browse files
author
Michael Wangler
committed
New log file reader and .NET upgrade
* Added new custom log file reader for log files that are accessible via HTTP * Fixed some receiver settings were not stored properly * Upgraded to .NET 4.8
1 parent ca74cd0 commit 9fffb1d

File tree

60 files changed

+2427
-191
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+2427
-191
lines changed

‎LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
The MIT License (MIT)
22

3-
Copyright (c) 2020 couchcoding
3+
Copyright (c) 2021 couchcoding
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

‎README.md

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ Logbert is an advanced log message viewer for log4net, log4j and others.
88
* Chainsaw compatible loggers like log4net or nlog (UDP, TCP, File and Directory based)
99
* Windows event log
1010
* SysLog events (UDP, TCP and File based)
11+
* Customizable log receiver (UDP, TCP, HTTP, File and Directory based)
1112
* Create unlimited count of bookmarks
1213
* Filter log messages using a logger tree and level filter
1314
* Wildcard and regular expression based search
@@ -21,11 +22,6 @@ Logbert is an advanced log message viewer for log4net, log4j and others.
2122
* Trigger function if a new log message is received or a bookmark is changed
2223
* Statistic windows to see the log level ratio.
2324
* Directory based receiving (load multiple log files as one)
24-
* Customizable log receiver (UDP, TCP, File and Directory based)
25-
26-
### Planned Features
27-
* HTML Reporting
28-
* More log receivers
2925

3026
### Copyright & License
3127

‎src/Couchcoding.Logbert.Gui/Controls/DataGridViewEx.cs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,9 @@ protected override void CreateHandle()
7373
}
7474
}
7575

76+
/// <summary>
77+
/// Handles the OnPaint event.
78+
/// </summary>
7679
protected override void OnPaint(PaintEventArgs e)
7780
{
7881
base.OnPaint(e);
@@ -102,6 +105,7 @@ protected override void OnPaint(PaintEventArgs e)
102105
public void ApplyTheme(BaseTheme theme)
103106
{
104107
BackColor = theme.ColorPalette.ContentBackground;
108+
ColumnHeadersDefaultCellStyle.SelectionBackColor = ColumnHeadersDefaultCellStyle.BackColor;
105109

106110
foreach (Control ctrl in Controls)
107111
{

‎src/Couchcoding.Logbert.Gui/Controls/InfoPanel.cs

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -328,33 +328,33 @@ protected override void OnPaint(PaintEventArgs e)
328328

329329
if (mShowInfoIcon && mInfoImage != null)
330330
{
331-
Rectangle imageRect = new Rectangle(0, 0,
331+
Rectangle imageRect = new Rectangle(4, 4,
332332
mInfoImage.Width, mInfoImage.Height);
333333

334334
if (mShowBorder)
335335
{
336336
imageRect.Offset(
337-
RescaleByDpiX(4),
338-
RescaleByDpiY(6));
337+
RescaleByDpiX(2),
338+
RescaleByDpiY(2));
339339
}
340340

341341
e.Graphics.DrawImage(mInfoImage, imageRect, new Rectangle(
342342
0, 0, imageRect.Width, imageRect.Height), GraphicsUnit.Pixel);
343343
}
344344

345-
int textOffsetLeft = (mShowBorder ? RescaleByDpiX(6) :
346-
RescaleByDpiX(3)) + (mInfoImage != null ? mShowInfoIcon ? mInfoImage.Width : 0 : 0);
345+
int textOffsetLeft = (mShowBorder ? RescaleByDpiX(10) :
346+
RescaleByDpiX(6)) + (mInfoImage != null ? mShowInfoIcon ? mInfoImage.Width : 0 : 0);
347347

348348
int textOffsetTop = mShowTitle ?
349-
RescaleByDpiX(18) : 0;
349+
RescaleByDpiX(24) : 0;
350350

351351
if (mShowTitle && !string.IsNullOrEmpty(mTitle))
352352
{
353353
Rectangle titleRect = new Rectangle(
354354
textOffsetLeft + mTextPadding.Left,
355-
mTextPadding.Top + RescaleByDpiY(3),
356-
ClientRectangle.Width - (RescaleByDpiX(6) + mTextPadding.Right + mTextPadding.Left),
357-
RescaleByDpiY(20));
355+
mTextPadding.Top + RescaleByDpiY(6),
356+
ClientRectangle.Width - (RescaleByDpiX(12) + mTextPadding.Right + mTextPadding.Left),
357+
RescaleByDpiY(24));
358358

359359
using (Font boldFont = new Font(Font, FontStyle.Bold))
360360
{

‎src/Couchcoding.Logbert.Gui/Controls/TableLayoutPanelEx.cs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,9 @@
3434

3535
namespace Couchcoding.Logbert.Gui.Controls
3636
{
37+
/// <summary>
38+
/// Implements a more performant <see cref="TableLayoutPanel"/>.
39+
/// </summary>
3740
public class TableLayoutPanelEx : TableLayoutPanel
3841
{
3942
#region Public Properties

‎src/Couchcoding.Logbert.Gui/Couchcoding.Logbert.Gui.csproj

Lines changed: 26 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2+
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
44
<PropertyGroup>
55
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -9,7 +9,7 @@
99
<AppDesignerFolder>Properties</AppDesignerFolder>
1010
<RootNamespace>Couchcoding.Logbert.Gui</RootNamespace>
1111
<AssemblyName>Couchcoding.Logbert.Gui</AssemblyName>
12-
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
12+
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
1313
<FileAlignment>512</FileAlignment>
1414
<TargetFrameworkProfile />
1515
</PropertyGroup>
@@ -21,6 +21,7 @@
2121
<PlatformTarget>x86</PlatformTarget>
2222
<ErrorReport>prompt</ErrorReport>
2323
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
24+
<Prefer32Bit>false</Prefer32Bit>
2425
</PropertyGroup>
2526
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
2627
<OutputPath>bin\x86\Release\</OutputPath>
@@ -30,6 +31,7 @@
3031
<PlatformTarget>x86</PlatformTarget>
3132
<ErrorReport>prompt</ErrorReport>
3233
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
34+
<Prefer32Bit>false</Prefer32Bit>
3335
</PropertyGroup>
3436
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
3537
<DebugSymbols>true</DebugSymbols>
@@ -39,6 +41,7 @@
3941
<PlatformTarget>AnyCPU</PlatformTarget>
4042
<ErrorReport>prompt</ErrorReport>
4143
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
44+
<Prefer32Bit>false</Prefer32Bit>
4245
</PropertyGroup>
4346
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'">
4447
<OutputPath>bin\Release\</OutputPath>
@@ -48,6 +51,27 @@
4851
<PlatformTarget>AnyCPU</PlatformTarget>
4952
<ErrorReport>prompt</ErrorReport>
5053
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
54+
<Prefer32Bit>false</Prefer32Bit>
55+
</PropertyGroup>
56+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
57+
<DebugSymbols>true</DebugSymbols>
58+
<OutputPath>bin\x64\Debug\</OutputPath>
59+
<DefineConstants>DEBUG;TRACE</DefineConstants>
60+
<DebugType>full</DebugType>
61+
<PlatformTarget>x64</PlatformTarget>
62+
<LangVersion>7.3</LangVersion>
63+
<ErrorReport>prompt</ErrorReport>
64+
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
65+
</PropertyGroup>
66+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
67+
<OutputPath>bin\x64\Release\</OutputPath>
68+
<DefineConstants>TRACE</DefineConstants>
69+
<Optimize>true</Optimize>
70+
<DebugType>pdbonly</DebugType>
71+
<PlatformTarget>x64</PlatformTarget>
72+
<LangVersion>7.3</LangVersion>
73+
<ErrorReport>prompt</ErrorReport>
74+
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
5175
</PropertyGroup>
5276
<ItemGroup>
5377
<Reference Include="System" />

‎src/Couchcoding.Logbert.Gui/Properties/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,5 +31,5 @@
3131
// You can specify all the values or you can default the Build and Revision Numbers
3232
// by using the '*' as shown below:
3333
// [assembly: AssemblyVersion("1.0.*")]
34-
[assembly: AssemblyVersion("1.6.2.0")]
35-
[assembly: AssemblyFileVersion("1.6.2.0")]
34+
[assembly: AssemblyVersion("1.6.3.0")]
35+
[assembly: AssemblyFileVersion("1.6.3.0")]

‎src/Couchcoding.Logbert.Theme/Couchcoding.Logbert.Theme.csproj

Lines changed: 26 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,10 @@
99
<AppDesignerFolder>Properties</AppDesignerFolder>
1010
<RootNamespace>Couchcoding.Logbert.Theme</RootNamespace>
1111
<AssemblyName>Couchcoding.Logbert.Theme</AssemblyName>
12-
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
12+
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
1313
<FileAlignment>512</FileAlignment>
1414
<Deterministic>true</Deterministic>
15+
<TargetFrameworkProfile />
1516
</PropertyGroup>
1617
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
1718
<DebugSymbols>true</DebugSymbols>
@@ -21,6 +22,7 @@
2122
<PlatformTarget>x86</PlatformTarget>
2223
<ErrorReport>prompt</ErrorReport>
2324
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
25+
<Prefer32Bit>false</Prefer32Bit>
2426
</PropertyGroup>
2527
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
2628
<OutputPath>bin\x86\Release\</OutputPath>
@@ -30,6 +32,7 @@
3032
<PlatformTarget>x86</PlatformTarget>
3133
<ErrorReport>prompt</ErrorReport>
3234
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
35+
<Prefer32Bit>false</Prefer32Bit>
3336
</PropertyGroup>
3437
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
3538
<DebugSymbols>true</DebugSymbols>
@@ -39,6 +42,7 @@
3942
<PlatformTarget>AnyCPU</PlatformTarget>
4043
<ErrorReport>prompt</ErrorReport>
4144
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
45+
<Prefer32Bit>false</Prefer32Bit>
4246
</PropertyGroup>
4347
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'">
4448
<OutputPath>bin\Release\</OutputPath>
@@ -48,6 +52,27 @@
4852
<PlatformTarget>AnyCPU</PlatformTarget>
4953
<ErrorReport>prompt</ErrorReport>
5054
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
55+
<Prefer32Bit>false</Prefer32Bit>
56+
</PropertyGroup>
57+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
58+
<DebugSymbols>true</DebugSymbols>
59+
<OutputPath>bin\x64\Debug\</OutputPath>
60+
<DefineConstants>DEBUG;TRACE</DefineConstants>
61+
<DebugType>full</DebugType>
62+
<PlatformTarget>x64</PlatformTarget>
63+
<LangVersion>7.3</LangVersion>
64+
<ErrorReport>prompt</ErrorReport>
65+
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
66+
</PropertyGroup>
67+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
68+
<OutputPath>bin\x64\Release\</OutputPath>
69+
<DefineConstants>TRACE</DefineConstants>
70+
<Optimize>true</Optimize>
71+
<DebugType>pdbonly</DebugType>
72+
<PlatformTarget>x64</PlatformTarget>
73+
<LangVersion>7.3</LangVersion>
74+
<ErrorReport>prompt</ErrorReport>
75+
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
5176
</PropertyGroup>
5277
<ItemGroup>
5378
<Reference Include="System" />

‎src/Couchcoding.Logbert.Theme/Properties/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,5 +31,5 @@
3131
// You can specify all the values or you can default the Build and Revision Numbers
3232
// by using the '*' as shown below:
3333
// [assembly: AssemblyVersion("1.0.*")]
34-
[assembly: AssemblyVersion("1.6.2.0")]
35-
[assembly: AssemblyFileVersion("1.6.2.0")]
34+
[assembly: AssemblyVersion("1.6.3.0")]
35+
[assembly: AssemblyFileVersion("1.6.3.0")]

‎src/Couchcoding.Logbert.Theme/Properties/VisualStudioBlueResource.Designer.cs

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)