Browse Source

PRS Version 7.17h - did several quick updates to get production server stable again, missed some previous update letters in source control

Nick-PRSDigital@bitbucket.org 2 năm trước cách đây
mục cha
commit
2955e74ab2

+ 1 - 1
prs.desktop/prsdesktop.iss

@@ -5,7 +5,7 @@
 #pragma verboselevel 9
 #pragma verboselevel 9
 
 
 #define MyAppName "PRS Desktop"
 #define MyAppName "PRS Desktop"
-#define MyAppVersion "7.17f"
+#define MyAppVersion "7.17h"
 #define MyAppPublisher "PRS Digital"
 #define MyAppPublisher "PRS Digital"
 #define MyAppURL "https://www.prs-software.com.au"
 #define MyAppURL "https://www.prs-software.com.au"
 #define MyAppExeName "PRSDesktop.exe"
 #define MyAppExeName "PRSDesktop.exe"

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

@@ -209,17 +209,20 @@ namespace PRSServer
             // }
             // }
             // // This should be out of the if-statement, since the listener needs to be initialised, even if the web socket port is 0.
             // // This should be out of the if-statement, since the listener needs to be initialised, even if the web socket port is 0.
 
 
-            Logger.Send(LogType.Information, "", string.Format("Starting Rest Listener: Port={0}", 0));
+            Logger.Send(LogType.Information, "", string.Format("Starting Rest Listener: Port={0}", Properties.Port));
 
 
             RestListener.Init(0); //this used to be Properties.WebSocketPort, however we are temporarily using this port to configure the RPCSocket connection
             RestListener.Init(0); //this used to be Properties.WebSocketPort, however we are temporarily using this port to configure the RPCSocket connection
             InitialisePort();
             InitialisePort();
             RestListener.Start();
             RestListener.Start();
 
 
-            Logger.Send(LogType.Information, "", string.Format("Rest Listener Started: Port={0}", 0));
+            Logger.Send(LogType.Information, "", string.Format("Rest Listener Started: Port={0}", Properties.Port));
 
 
             //TODO remove this (only being used for temporary site app to connect to)
             //TODO remove this (only being used for temporary site app to connect to)
-            if (Properties.WebSocketPort == 0)
+            if (Properties.Port == 8000)
                 Properties.WebSocketPort = 8050;
                 Properties.WebSocketPort = 8050;
+            else
+                Properties.WebSocketPort = 0;
+            //had to do this because configuring the WebSocketPort on the server grid was ignored and causing issues on the production server - to remove when a fix is found 
 
 
             if (Properties.WebSocketPort != 0)
             if (Properties.WebSocketPort != 0)
             {
             {

+ 1 - 1
prs.server/PRSServer.iss

@@ -5,7 +5,7 @@
 #pragma verboselevel 9
 #pragma verboselevel 9
 
 
 #define MyAppName "PRS Server"
 #define MyAppName "PRS Server"
-#define MyAppVersion "7.17f"
+#define MyAppVersion "7.17h"
 #define MyAppPublisher "PRS Digital"
 #define MyAppPublisher "PRS Digital"
 #define MyAppURL "https://www.prs-software.com.au"
 #define MyAppURL "https://www.prs-software.com.au"
 #define MyAppExeName "PRSServer.exe"
 #define MyAppExeName "PRSServer.exe"