Merge pull request payara#4442 from bbulk/issue-4169

fixes issue payara#4169 - Display node uptime in a human readable format
sgflt · Feb 8, 2020 · 1aee9ce · 1aee9ce
2 parents 58b01f7 + 3aa66dc
commit 1aee9ce
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/appserver/admingui/cluster/src/main/resources/standalone/standaloneInstanceGeneral.jsf b/appserver/admingui/cluster/src/main/resources/standalone/standaloneInstanceGeneral.jsf
@@ -167,7 +167,11 @@
             <sun:staticText id="statusReason" text="#{pageSession.statusReason}" />
         </sun:property>
         <sun:property id="uptimeProp" labelAlign="left" noWrap="#{true}" overlapLabel="#{false}" label="$resource{i18ncs.cluster.Uptime}:" >
-            <sun:staticText id="uptime" text="#{pageSession.statusUptime} (ms)" />
+            <!beforeCreate
+                convertMillisToReadable(milliseconds="#{pageSession.statusUptime}"
+                                        readableString=>$attribute{formattedUpTime});
+                />
+            <sun:staticText id="uptime" text="#{formattedUpTime}" />
         </sun:property>
         <sun:property id="deploymentGroupProp" labelAlign="left" noWrap="#{true}" overlapLabel="#{false}" label="$resource{i18ncs.cluster.DeploymentGroup}:" >
             <sun:staticText id="deploymentGRoup" text="#{pageSession.statusDG}" />

diff --git a/.../admingui/common/src/main/java/org/glassfish/admingui/common/handlers/CommonHandlers.java b/.../admingui/common/src/main/java/org/glassfish/admingui/common/handlers/CommonHandlers.java
@@ -270,7 +270,7 @@ public static void convertMillisToReadable(HandlerContext handlerCtx) {
 
         String readableString = "";
 
-        long msecLeftover = milliseconds;
+        long msecLeftover = milliseconds != null ? milliseconds : 0L;
 
         long numWeeks = msecLeftover / MSEC_PER_WEEK;
         msecLeftover -= numWeeks * MSEC_PER_WEEK;