Skip to content

Commit ff889ad

Browse files
authored
Merge pull request LogExperts#389 from LogExperts/380-configure-port-used-by-logexpert
This PR removes the existing gRPC-based transport and replaces it with a Named Pipe–based IPC mechanism for LogExpert, updating configuration, service startup, and message definitions accordingly. - Removed the standalone gRPC service project and its configuration files. - Added IPC-related types (LoadPayload, IpcMessageType, IpcMessage) and Named Pipe server/client loops. - Updated Program.cs and other core projects to serialize commands into JSON and route via Named Pipes.
2 parents 1bd3826 + 1345a7d commit ff889ad

18 files changed

Lines changed: 266 additions & 348 deletions

src/LogExpert.sln

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "setup", "setup", "{C625E7C2
5656
EndProject
5757
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RegexColumnizer.UnitTests", "RegexColumnizer.UnitTests\RegexColumnizer.UnitTests.csproj", "{FBFB598D-B94A-4AD3-A355-0D5A618CEEE3}"
5858
EndProject
59-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LogexpertgRPCService", "LogexpertgRPCService\LogexpertgRPCService.csproj", "{D31D1721-9DEA-45A4-B813-D5023B2EC2CC}"
60-
EndProject
6159
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LogExpert.Core", "Logexpert.Core\LogExpert.Core.csproj", "{F49C6738-3F62-4890-8FF2-1F53A0F0A2CD}"
6260
EndProject
6361
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LogExpert.Resources", "Logexpert.Resources\LogExpert.Resources.csproj", "{578CC5D5-1DCD-47C2-8BD3-B32C14635BEC}"
@@ -138,10 +136,6 @@ Global
138136
{FBFB598D-B94A-4AD3-A355-0D5A618CEEE3}.Debug|Any CPU.Build.0 = Debug|Any CPU
139137
{FBFB598D-B94A-4AD3-A355-0D5A618CEEE3}.Release|Any CPU.ActiveCfg = Release|Any CPU
140138
{FBFB598D-B94A-4AD3-A355-0D5A618CEEE3}.Release|Any CPU.Build.0 = Release|Any CPU
141-
{D31D1721-9DEA-45A4-B813-D5023B2EC2CC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
142-
{D31D1721-9DEA-45A4-B813-D5023B2EC2CC}.Debug|Any CPU.Build.0 = Debug|Any CPU
143-
{D31D1721-9DEA-45A4-B813-D5023B2EC2CC}.Release|Any CPU.ActiveCfg = Release|Any CPU
144-
{D31D1721-9DEA-45A4-B813-D5023B2EC2CC}.Release|Any CPU.Build.0 = Release|Any CPU
145139
{F49C6738-3F62-4890-8FF2-1F53A0F0A2CD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
146140
{F49C6738-3F62-4890-8FF2-1F53A0F0A2CD}.Debug|Any CPU.Build.0 = Debug|Any CPU
147141
{F49C6738-3F62-4890-8FF2-1F53A0F0A2CD}.Release|Any CPU.ActiveCfg = Release|Any CPU

src/LogExpert/Classes/LogExpertApplicationContext.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
using System;
2-
using System.Windows.Forms;
1+
using LogExpert.Controls.LogTabWindow;
32

4-
using LogExpert.Controls.LogTabWindow;
3+
using System;
4+
using System.Windows.Forms;
55

66
namespace LogExpert.Classes
77
{

src/LogExpert/Classes/LogExpertProxy.cs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
using LogExpert.Controls.LogTabWindow;
2-
using LogExpert.Grpc;
32
using LogExpert.Interface;
43

54
using NLog;
@@ -10,11 +9,11 @@
109

1110
namespace LogExpert.Classes
1211
{
13-
internal class LogExpertProxy : LogExpertService.LogExpertServiceBase, ILogExpertProxy
12+
internal class LogExpertProxy : ILogExpertProxy
1413
{
1514
#region Fields
1615

17-
private static readonly ILogger _logger = LogManager.GetCurrentClassLogger();
16+
private static readonly Logger _logger = LogManager.GetCurrentClassLogger();
1817

1918
[NonSerialized] private readonly List<LogTabWindow> _windowList = [];
2019

@@ -113,7 +112,7 @@ public void NewWindowOrLockedWindow(string[] fileNames)
113112
public void NewWindowWorker(string[] fileNames)
114113
{
115114
_logger.Info("Creating new LogTabWindow");
116-
LogTabWindow logWin = new(fileNames.Length > 0 ? fileNames : null, _logWindowIndex++, true)
115+
LogTabWindow logWin = new(fileNames?.Length > 0 ? fileNames : null, _logWindowIndex++, true)
117116
{
118117
LogExpertProxy = this
119118
};

src/LogExpert/LogExpert.csproj

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -61,18 +61,13 @@
6161
<ItemGroup>
6262
<PackageReference Include="DockPanelSuite" />
6363
<PackageReference Include="DockPanelSuite.ThemeVS2015" />
64-
<PackageReference Include="Grpc.AspNetCore" />
65-
<PackageReference Include="Google.Protobuf" />
66-
<PackageReference Include="Grpc.Core" />
67-
<PackageReference Include="Grpc.Tools" PrivateAssets="All" />
6864
<PackageReference Include="System.Text.Encoding" />
6965
<PackageReference Include="Newtonsoft.Json" />
7066
<PackageReference Include="NLog" />
7167
</ItemGroup>
7268
<ItemGroup>
7369
<ProjectReference Include="..\ColumnizerLib\ColumnizerLib.csproj" />
7470
<ProjectReference Include="..\Logexpert.UI\LogExpert.UI.csproj" />
75-
<ProjectReference Include="..\LogexpertgRPCService\LogexpertgRPCService.csproj" />
7671
<ProjectReference Include="..\PluginRegistry\LogExpert.PluginRegistry.csproj" />
7772
</ItemGroup>
7873
<ItemGroup>

0 commit comments

Comments
 (0)