From 30f9d25d77ccb5cd978d4cf8fa389ec819e90e95 Mon Sep 17 00:00:00 2001
From: Philip L. McMahon <philip.l.mcmahon@gmail.com>
Date: Fri, 27 Jan 2012 02:02:19 -0500
Subject: [PATCH] Correct update of HEAD symbolic reference when target is a tag.
---
src/com/gitblit/models/ServerStatus.java | 37 +++++++++++++++++++++++++------------
1 files changed, 25 insertions(+), 12 deletions(-)
diff --git a/src/com/gitblit/models/ServerStatus.java b/src/com/gitblit/models/ServerStatus.java
index b1dc52d..3e7e8d8 100644
--- a/src/com/gitblit/models/ServerStatus.java
+++ b/src/com/gitblit/models/ServerStatus.java
@@ -17,12 +17,14 @@
import java.io.Serializable;
import java.util.Date;
-import java.util.HashMap;
import java.util.Map;
+import java.util.TreeMap;
+
+import com.gitblit.Constants;
/**
* ServerStatus encapsulates runtime status information about the server
- * including the system environment.
+ * including some information about the system environment.
*
* @author James Moger
*
@@ -32,21 +34,32 @@
private static final long serialVersionUID = 1L;
public final Date bootDate;
-
- public final long heapSize;
+
+ public final String version;
+
+ public final String releaseDate;
+
+ public final boolean isGO;
public final Map<String, String> systemProperties;
-
+
+ public final long heapMaximum;
+
public volatile long heapAllocated;
-
+
public volatile long heapFree;
- public ServerStatus() {
- bootDate = new Date();
-
- heapSize = Runtime.getRuntime().maxMemory();
-
- systemProperties = new HashMap<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.io.tmpdir");
--
Gitblit v1.9.1