|
|
@@ -370,22 +370,21 @@ namespace PRSServer
|
|
|
{
|
|
|
while (true)
|
|
|
{
|
|
|
- var transport = new RpcClientPipeTransport(DatabaseServerProperties.GetPipeName(key));
|
|
|
-
|
|
|
- try
|
|
|
+ var client = new RpcClientPipeTransport(DatabaseServerProperties.GetPipeName(key));
|
|
|
+ //var client = IPCClientFactory.GetClient(DatabaseServerProperties.GetPipeName(key));
|
|
|
+ var response = client.Info();
|
|
|
+ //var response = client.Send(IPCMessage.Info(new InfoRequest()), 10_000).GetResponse<InfoResponse>();
|
|
|
+ if (response != null)
|
|
|
{
|
|
|
- var response = transport.Send<RpcInfoCommand, RpcInfoParameters, RpcInfoResult>(new RpcInfoParameters());
|
|
|
- SecureConnections[key] = response.Info?.IsHTTPS ?? false;
|
|
|
+ SecureConnections[key] = response.IsHTTPS;
|
|
|
break;
|
|
|
}
|
|
|
- catch
|
|
|
+ else
|
|
|
{
|
|
|
SecureConnections.Remove(key);
|
|
|
var service = GetService(key);
|
|
|
if (service is null || service.Status != ServiceControllerStatus.Running)
|
|
|
- {
|
|
|
break;
|
|
|
- }
|
|
|
}
|
|
|
}
|
|
|
Dispatcher.Invoke(() =>
|
|
|
@@ -1090,9 +1089,7 @@ namespace PRSServer
|
|
|
currentServerPort = null;
|
|
|
currentServerURL = null;
|
|
|
currentServerName = pipeName;
|
|
|
-
|
|
|
- var transport = new RpcClientPipeTransport(pipeName);
|
|
|
- ClientFactory.SetClientType(typeof(RpcClient<>), Platform.Server, CoreUtils.GetVersion(), transport);
|
|
|
+ ClientFactory.SetClientType(typeof(IPCClient<>), Platform.Server, CoreUtils.GetVersion(), pipeName);
|
|
|
using (new WaitCursor())
|
|
|
{
|
|
|
if (!Client.Ping())
|
