Merge pull request #4129 from sbwalker/dev

add Process info to System Info to indicate if process is 32 bit or 64 bit
oqtane · Apr 11, 2024 · 48eeb27 · 48eeb27
2 parents 8a2d79e + d675662
commit 48eeb27
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 16 deletions.
diff --git a/Oqtane.Client/Modules/Admin/SystemInfo/Index.razor b/Oqtane.Client/Modules/Admin/SystemInfo/Index.razor
@@ -26,6 +26,12 @@
                     <input id="osversion" class="form-control" @bind="@_osversion" readonly />
                 </div>
             </div>
+            <div class="row mb-1 align-items-center">
+                <Label Class="col-sm-3" For="process" HelpText="Indicates if the current process is 32 bit or 64 bit" ResourceKey="Process">Process: </Label>
+                <div class="col-sm-9">
+                    <input id="process" class="form-control" @bind="@_process" readonly />
+                </div>
+            </div>
             <div class="row mb-1 align-items-center">
                 <Label Class="col-sm-3" For="machinename" HelpText="Machine Name" ResourceKey="MachineName">Machine Name: </Label>
                 <div class="col-sm-9">
@@ -62,12 +68,6 @@
                     <input id="servertime" class="form-control" @bind="@_servertime" readonly />
                 </div>
             </div>
-            <div class="row mb-1 align-items-center">
-                <Label Class="col-sm-3" For="tickcount" HelpText="Amount Of Time The Service Has Been Available And Operational" ResourceKey="TickCount">Service Uptime: </Label>
-                <div class="col-sm-9">
-                    <input id="tickcount" class="form-control" @bind="@_tickcount" readonly />
-                </div>
-            </div>
             <div class="row mb-1 align-items-center">
                 <Label Class="col-sm-3" For="workingset" HelpText="Memory Allocation Of Service (in MB)" ResourceKey="WorkingSet">Memory Allocation: </Label>
                 <div class="col-sm-9">
@@ -165,13 +165,13 @@
 	private string _version = string.Empty;
 	private string _clrversion = string.Empty;
 	private string _osversion = string.Empty;
-	private string _machinename = string.Empty;
+    private string _process = string.Empty;
+    private string _machinename = string.Empty;
 	private string _ipaddress = string.Empty;
 	private string _environment = string.Empty;
 	private string _contentrootpath = string.Empty;
 	private string _webrootpath = string.Empty;
 	private string _servertime = string.Empty;
-	private string _tickcount = string.Empty;
 	private string _workingset = string.Empty;
 	private string _installationid = string.Empty;
 
@@ -192,13 +192,13 @@
 		{
 			_clrversion = systeminfo["CLRVersion"].ToString();
 			_osversion = systeminfo["OSVersion"].ToString();
-			_machinename = systeminfo["MachineName"].ToString();
+            _process = systeminfo["Process"].ToString();
+            _machinename = systeminfo["MachineName"].ToString();
 			_ipaddress = systeminfo["IPAddress"].ToString();
 			_environment = systeminfo["Environment"].ToString();
 			_contentrootpath = systeminfo["ContentRootPath"].ToString();
 			_webrootpath = systeminfo["WebRootPath"].ToString();
 			_servertime = systeminfo["ServerTime"].ToString() + " UTC";
-			_tickcount = TimeSpan.FromMilliseconds(Convert.ToInt64(systeminfo["TickCount"].ToString())).ToString();
 			_workingset = (Convert.ToInt64(systeminfo["WorkingSet"].ToString()) / 1000000).ToString() + " MB";
 		}
 

diff --git a/Oqtane.Client/Resources/Modules/Admin/SystemInfo/Index.resx b/Oqtane.Client/Resources/Modules/Admin/SystemInfo/Index.resx
@@ -255,12 +255,6 @@
   <data name="MachineName.Text" xml:space="preserve">
     <value>Machine Name:</value>
   </data>
-  <data name="TickCount.HelpText" xml:space="preserve">
-    <value>Amount Of Time The Service Has Been Available And Operational</value>
-  </data>
-  <data name="TickCount.Text" xml:space="preserve">
-    <value>Service Uptime:</value>
-  </data>
   <data name="WebRootPath.HelpText" xml:space="preserve">
     <value>Server Web Root Path</value>
   </data>
@@ -294,4 +288,10 @@
   <data name="Error.ClearLog" xml:space="preserve">
     <value>Ann Error Occurred Clearing The System Log</value>
   </data>
+  <data name="Process.HelpText" xml:space="preserve">
+    <value>Indicates if the current process is 32 bit or 64 bit</value>
+  </data>
+  <data name="Process.Text" xml:space="preserve">
+    <value>Process: </value>
+  </data>
 </root>
diff --git a/Oqtane.Server/Controllers/SystemController.cs b/Oqtane.Server/Controllers/SystemController.cs
@@ -34,6 +34,7 @@ public SystemController(IWebHostEnvironment environment, IConfigManager configMa
                 case "environment":
                     systeminfo.Add("CLRVersion", Environment.Version.ToString());
                     systeminfo.Add("OSVersion", Environment.OSVersion.ToString());
+                    systeminfo.Add("Process", (Environment.Is64BitProcess) ? "64 Bit" : "32 Bit");
                     systeminfo.Add("MachineName", Environment.MachineName);
                     systeminfo.Add("WorkingSet", Environment.WorkingSet.ToString());
                     systeminfo.Add("TickCount", Environment.TickCount64.ToString());