From 820f25699da1f01fd6bcd748370e838036b328fa Mon Sep 17 00:00:00 2001
From: Chris Kearney <chris@kearneymail.com>
Date: Mon, 17 Aug 2015 22:10:51 -0700
Subject: [PATCH] got the timestamp worked the way i want for the build version
---
src/main/java/com/comandante/creeper/Main.java | 10 ++++++----
.../comandante/creeper/command/admin/SystemInfo.java | 12 ++++++------
2 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/comandante/creeper/Main.java b/src/main/java/com/comandante/creeper/Main.java
index 9b1707c7..fb7e1ef2 100644
--- a/src/main/java/com/comandante/creeper/Main.java
+++ b/src/main/java/com/comandante/creeper/Main.java
@@ -50,13 +50,15 @@ public class Main {
return "0";
}
String buildVersion = props.getProperty("build.version");
- long buildTimestamp = Long.parseLong(props.getProperty("build.timestamp"));
+ String timestampString = props.getProperty("build.timestamp");
+ if (buildVersion == null || timestampString == null || timestampString.isEmpty() || buildVersion.isEmpty()) {
+ return "creeper-local-dev";
+ }
+ long buildTimestamp = Long.parseLong(timestampString);
Date date = new Date(buildTimestamp);
SimpleDateFormat format = new SimpleDateFormat();
String dateFormatted = format.format(date);
- if (buildVersion == null) {
- return "creeper-local-dev";
- }
+
return buildVersion + " " + dateFormatted;
}
public static void main(String[] args) throws Exception {
diff --git a/src/main/java/com/comandante/creeper/command/admin/SystemInfo.java b/src/main/java/com/comandante/creeper/command/admin/SystemInfo.java
index 72fc123f..a19ee260 100644
--- a/src/main/java/com/comandante/creeper/command/admin/SystemInfo.java
+++ b/src/main/java/com/comandante/creeper/command/admin/SystemInfo.java
@@ -45,27 +45,27 @@ public class SystemInfo extends Command {
.append("os_name:")
.append(Color.RESET)
.append(os_name)
- .append(" | ")
+ .append("\r\n")
.append(Color.MAGENTA)
- .append(" os_version:")
+ .append("os_version:")
.append(Color.RESET)
.append(os_version)
- .append(" | ")
+ .append("\r\n")
.append(Color.MAGENTA)
.append("java_version:")
.append(Color.RESET)
.append(java_version)
- .append(" | ")
+ .append("\r\n")
.append(Color.MAGENTA)
.append("max_heap:")
.append(Color.RESET)
.append(maxHeap)
- .append(" | ")
+ .append("\r\n")
.append(Color.MAGENTA)
.append("uptime:")
.append(Color.RESET)
.append(upTime)
- .append(" | ")
+ .append("\r\n")
.append(Color.MAGENTA)
.append("build:")
.append(Color.RESET)
--
GitLab