From 9effe1630d97039b3e01cd9b58ed07e75be1d63c Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Mon, 25 Feb 2013 08:40:30 -0500
Subject: [PATCH] Merge pull request #75 from thefake/master
---
src/com/gitblit/models/ServerStatus.java | 32 +++++++++++++++++++++++---------
1 files changed, 23 insertions(+), 9 deletions(-)
diff --git a/src/com/gitblit/models/ServerStatus.java b/src/com/gitblit/models/ServerStatus.java
index 8dfc0fb..f1650c8 100644
--- a/src/com/gitblit/models/ServerStatus.java
+++ b/src/com/gitblit/models/ServerStatus.java
@@ -20,6 +20,8 @@
import java.util.Map;
import java.util.TreeMap;
+import com.gitblit.Constants;
+
/**
* ServerStatus encapsulates runtime status information about the server
* including some information about the system environment.
@@ -32,23 +34,35 @@
private static final long serialVersionUID = 1L;
public final Date bootDate;
-
+
+ public final String version;
+
+ public final String releaseDate;
+
+ public final boolean isGO;
+
public final Map<String, String> systemProperties;
- public final long heapSize;
+ public final long heapMaximum;
public volatile long heapAllocated;
-
+
public volatile long heapFree;
- public ServerStatus() {
- bootDate = new Date();
-
- heapSize = Runtime.getRuntime().maxMemory();
-
- systemProperties = new TreeMap<String, String>();
+ public String servletContainer;
+
+ public ServerStatus(boolean isGO) {
+ this.bootDate = new Date();
+ this.version = Constants.VERSION;
+ this.releaseDate = Constants.VERSION_DATE;
+ this.isGO = isGO;
+
+ this.heapMaximum = Runtime.getRuntime().maxMemory();
+
+ this.systemProperties = new TreeMap<String, String>();
put("file.encoding");
put("java.home");
+ put("java.awt.headless");
put("java.io.tmpdir");
put("java.runtime.name");
put("java.runtime.version");
--
Gitblit v1.9.1