|
@@ -166,14 +166,13 @@ namespace PRSDesktop
|
|
|
|
|
|
case DatabaseType.Networked:
|
|
|
//new RPC stuff (temporary disabled - for enabling when RPC is ready)
|
|
|
- //_transport = new RpcClientSocketTransport(App.DatabaseSettings.URLs);
|
|
|
- //_transport.OnClose += TransportConnectionLost;
|
|
|
- //_transport.Connect();
|
|
|
- //ClientFactory.SetClientType(typeof(RpcClient<>), Platform.Wpf, CoreUtils.GetVersion(), _transport );
|
|
|
+ /*_transport = new RpcClientSocketTransport(App.DatabaseSettings.URLs);
|
|
|
+ _transport.OnClose += TransportConnectionLost;
|
|
|
+ _transport.Connect();
|
|
|
+ ClientFactory.SetClientType(typeof(RpcClient<>), Platform.Wpf, CoreUtils.GetVersion(), _transport );*/
|
|
|
|
|
|
var url = RestClient<User>.Ping(App.DatabaseSettings.URLs, out DatabaseInfo info);
|
|
|
- ClientFactory.SetClientType(typeof(RestClient<>), Platform.Wpf, CoreUtils.GetVersion(),
|
|
|
- url, true);
|
|
|
+ ClientFactory.SetClientType(typeof(RestClient<>), Platform.Wpf, CoreUtils.GetVersion(), url, true);
|
|
|
break;
|
|
|
|
|
|
case DatabaseType.Local:
|
|
@@ -349,21 +348,29 @@ namespace PRSDesktop
|
|
|
Dispatcher.Invoke(() => {
|
|
|
Progress.ShowModal("Reconnecting", (progress) =>
|
|
|
{
|
|
|
- DateTime lost = DateTime.Now;
|
|
|
- while (!client.IsConnected())
|
|
|
+ try
|
|
|
{
|
|
|
- progress.Report($"Connection lost - ({(DateTime.Now - lost):hh\\:mm})");
|
|
|
- try
|
|
|
+ DateTime lost = DateTime.Now;
|
|
|
+ while (!client.IsConnected())
|
|
|
{
|
|
|
- Logger.Send(LogType.Error,ClientFactory.UserID,"Reconnecting - ({0:hh\\:mm})",DateTime.Now - lost);
|
|
|
- client.Connect();
|
|
|
- if (client.IsConnected())
|
|
|
- ClientFactory.Validate(ClientFactory.SessionID);
|
|
|
- }
|
|
|
- catch (System.Exception e1)
|
|
|
- {
|
|
|
- Logger.Send(LogType.Error,ClientFactory.UserID,$"Reconnect Failed: {e1.Message}");
|
|
|
+ progress.Report($"Connection lost - ({(DateTime.Now - lost):hh\\:mm})");
|
|
|
+ try
|
|
|
+ {
|
|
|
+ Logger.Send(LogType.Error, ClientFactory.UserID, "Reconnecting - ({0:hh\\:mm})", DateTime.Now - lost);
|
|
|
+ client.Connect();
|
|
|
+ if (client.IsConnected())
|
|
|
+ break;
|
|
|
+ }
|
|
|
+ catch (System.Exception e1)
|
|
|
+ {
|
|
|
+ Logger.Send(LogType.Error, ClientFactory.UserID, $"Reconnect Failed: {e1.Message}");
|
|
|
+ }
|
|
|
}
|
|
|
+ ClientFactory.Validate(ClientFactory.SessionID);
|
|
|
+ }
|
|
|
+ catch(Exception e)
|
|
|
+ {
|
|
|
+ Logger.Send(LogType.Error, ClientFactory.UserID, $"Reconnect Failed: {e.Message}");
|
|
|
}
|
|
|
});
|
|
|
});
|