Przeglądaj źródła

Corrected Platform Flags in Database Engines

Frank van den Bos 2 lat temu
rodzic
commit
6bf109ec11

+ 3 - 3
prs.desktop/MainWindow.xaml.cs

@@ -156,19 +156,19 @@ namespace PRSDesktop
             switch (DatabaseType)
             {
                 case DatabaseType.Standalone:
-                    ClientFactory.SetClientType(typeof(LocalClient<>), "Wpf", CoreUtils.GetVersion());
+                    ClientFactory.SetClientType(typeof(LocalClient<>), Platform.Desktop, CoreUtils.GetVersion());
                     DbFactory.ColorScheme = App.DatabaseSettings.ColorScheme;
                     DbFactory.Logo = App.DatabaseSettings.Logo;
                     break;
                 
                 case DatabaseType.Networked:
                     var url = RestClient<User>.Ping(App.DatabaseSettings.URLs, out DatabaseInfo info);
-                    ClientFactory.SetClientType(typeof(RestClient<>), "Wpf", CoreUtils.GetVersion(), 
+                    ClientFactory.SetClientType(typeof(RestClient<>), Platform.Desktop, CoreUtils.GetVersion(), 
                         url, true);
                     break;
                 
                 case DatabaseType.Local:
-                    ClientFactory.SetClientType(typeof(IPCClient<>), "Wpf", CoreUtils.GetVersion(), 
+                    ClientFactory.SetClientType(typeof(IPCClient<>), Platform.Desktop, CoreUtils.GetVersion(), 
                         DatabaseServerProperties.GetPipeName(App.DatabaseSettings.LocalServerName));
                     break;
             }

+ 3 - 3
prs.server/Engines/Database/DatabaseEngine.cs

@@ -104,7 +104,7 @@ namespace PRSServer
             var user = CredentialsCache.Validate(session);
             if (user == null)
                 return Array.Empty<Notification>();
-            var store = DbFactory.FindStore<Notification>(user.ID, user.UserID, "", "");
+            var store = DbFactory.FindStore<Notification>(user.ID, user.UserID, Platform.DatabaseEngine, "");
             return store.Query(
                 new Filter<Notification>(x => x.Employee.UserLink.ID).IsEqualTo(user.ID)
                     .And(x => x.Closed).IsEqualTo(DateTime.MinValue),
@@ -131,7 +131,7 @@ namespace PRSServer
 
         private void ConfigureNotifier()
         {
-            Notify.Notifier?.AddPollHandler(PollNotifications);
+            Notify.AddPollHandler(PollNotifications);
         }
 
         public override void Run()
@@ -293,7 +293,7 @@ namespace PRSServer
                     notification.Employee.ID = employee.ID;
                     notification.Title = "HTTPS Certificate expires soon";
                     notification.Description = message;
-                    DbFactory.FindStore<Notification>(employee.UserLink.ID, employee.UserLink.UserID, "", "").Save(notification, "");
+                    DbFactory.FindStore<Notification>(employee.UserLink.ID, employee.UserLink.UserID, Platform.DatabaseEngine, "").Save(notification, "");
                 }
                 else
                 {

+ 1 - 1
prs.server/Engines/GPS/GPSEngine.cs

@@ -226,7 +226,7 @@ namespace PRSServer
             CoreUtils.RegisterClasses();
             ComalUtils.RegisterClasses();
 
-            ClientFactory.SetClientType(typeof(IPCClient<>), "GPSServer", Version, DatabaseServerProperties.GetPipeName(Properties.Server));
+            ClientFactory.SetClientType(typeof(IPCClient<>), Platform.GPSEngine, Version, DatabaseServerProperties.GetPipeName(Properties.Server));
             CheckConnection();
 
             DMFactory.Initialise(Properties.DumpFormat, Properties.DumpFile);

+ 1 - 1
prs.server/Engines/Scheduler/ScheduleEngine.cs

@@ -33,7 +33,7 @@ namespace PRSServer
                     Logger.Send(LogType.Error, "", "Server is blank!");
                     return;
                 }
-                ClientFactory.SetClientType(typeof(IPCClient<>), "Scheduler", Version, DatabaseServerProperties.GetPipeName(Properties.Server));
+                ClientFactory.SetClientType(typeof(IPCClient<>), Platform.SchedulerEngine, Version, DatabaseServerProperties.GetPipeName(Properties.Server));
                 CheckConnection();
 
                 Logger.Send(LogType.Information, "", "Starting Scheduler: ");

+ 1 - 1
prs.server/Engines/WebEngine/WebEngine.cs

@@ -29,7 +29,7 @@ namespace PRSServer
                 Logger.Send(LogType.Error, "", "Server is blank!");
                 return;
             }
-            ClientFactory.SetClientType(typeof(IPCClient<>), "WebEngine", Version, DatabaseServerProperties.GetPipeName(Properties.Server));
+            ClientFactory.SetClientType(typeof(IPCClient<>), Platform.WebEngine, Version, DatabaseServerProperties.GetPipeName(Properties.Server));
 
             Logger.Send(LogType.Information, "", "Registering Classes");
 

+ 4 - 4
prs.server/Forms/ServerGrid.cs

@@ -371,7 +371,7 @@ namespace PRSServer
                                 {
                                     var client = IPCClientFactory.GetClient(DatabaseServerProperties.GetPipeName(key));
 
-                                    var response = client.Send(IPCRequest.Info(new InfoRequest()), 10_000).GetResponse<InfoResponse>();
+                                    var response = client.Send(IPCMessage.Info(new InfoRequest()), 10_000).GetResponse<InfoResponse>();
                                     if (response.Status != StatusCode.Error)
                                     {
                                         SecureConnections[key] = response.Info.IsHTTPS;
@@ -1027,7 +1027,7 @@ namespace PRSServer
                         currentServerURL = url;
                         currentServerPort = port;
                         currentServerName = null;
-                        ClientFactory.SetClientType(typeof(RestClient<>), "PRSServer", CoreUtils.GetVersion(), url, port, true);
+                        ClientFactory.SetClientType(typeof(RestClient<>), Platform.Server, CoreUtils.GetVersion(), url, port, true);
 
                         // override the need to provide credentials when configuring the database
                         ClientFactory.SetBypass();
@@ -1087,7 +1087,7 @@ namespace PRSServer
                         currentServerPort = null;
                         currentServerURL = null;
                         currentServerName = pipeName;
-                        ClientFactory.SetClientType(typeof(IPCClient<>), "PRSServer", CoreUtils.GetVersion(), pipeName);
+                        ClientFactory.SetClientType(typeof(IPCClient<>), Platform.Server, CoreUtils.GetVersion(), pipeName);
                         using (new WaitCursor())
                         {
                             if (!Client.Ping())
@@ -1144,7 +1144,7 @@ namespace PRSServer
 
                 if (!DbFactory.IsProviderSet || DbFactory.Provider is not SQLiteProvider sql || sql.URL != properties.FileName)
                 {
-                    ClientFactory.SetClientType(typeof(LocalClient<>), "PRSServer", CoreUtils.GetVersion(), "");
+                    ClientFactory.SetClientType(typeof(LocalClient<>), Platform.Server, CoreUtils.GetVersion(), "");
                     Progress.ShowModal("Configuring database", (progress) =>
                     {
                         DbFactory.Stores = CoreUtils.TypeList(