From d40a44c8c8df8f6bd81c93e72314224f85656f18 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Sat, 07 Mar 2015 09:27:05 -0500
Subject: [PATCH] Merge branch 'ticket/245' into develop
---
src/main/java/com/gitblit/GitBlitServer.java | 32 ++++++++++++++------------------
1 files changed, 14 insertions(+), 18 deletions(-)
diff --git a/src/main/java/com/gitblit/GitBlitServer.java b/src/main/java/com/gitblit/GitBlitServer.java
index 4191e9b..a1fd071 100644
--- a/src/main/java/com/gitblit/GitBlitServer.java
+++ b/src/main/java/com/gitblit/GitBlitServer.java
@@ -148,6 +148,15 @@
System.exit(0);
}
+ protected File getBaseFolder(Params params) {
+ String path = System.getProperty("GITBLIT_HOME", Params.baseFolder);
+ if (!StringUtils.isEmpty(System.getenv("GITBLIT_HOME"))) {
+ path = System.getenv("GITBLIT_HOME");
+ }
+
+ return new File(path).getAbsoluteFile();
+ }
+
/**
* Stop Gitblt GO.
*/
@@ -170,7 +179,7 @@
* Start Gitblit GO.
*/
protected final void start(Params params) {
- final File baseFolder = new File(Params.baseFolder).getAbsoluteFile();
+ final File baseFolder = getBaseFolder(params);
FileSettings settings = params.FILESETTINGS;
if (!StringUtils.isEmpty(params.settingsfile)) {
if (new File(params.settingsfile).exists()) {
@@ -198,7 +207,9 @@
e.printStackTrace();
} finally {
try {
- is.close();
+ if (is != null) {
+ is.close();
+ }
} catch (IOException e) {
e.printStackTrace();
}
@@ -206,22 +217,7 @@
}
logger = LoggerFactory.getLogger(GitBlitServer.class);
- logger.info(Constants.BORDER);
- logger.info(" _____ _ _ _ _ _ _");
- logger.info(" | __ \\(_)| | | | | |(_)| |");
- logger.info(" | | \\/ _ | |_ | |__ | | _ | |_");
- logger.info(" | | __ | || __|| '_ \\ | || || __|");
- logger.info(" | |_\\ \\| || |_ | |_) || || || |_");
- logger.info(" \\____/|_| \\__||_.__/ |_||_| \\__|");
- int spacing = (Constants.BORDER.length() - Constants.getGitBlitVersion().length()) / 2;
- StringBuilder sb = new StringBuilder();
- while (spacing > 0) {
- spacing--;
- sb.append(' ');
- }
- logger.info(sb.toString() + Constants.getGitBlitVersion());
- logger.info("");
- logger.info(Constants.BORDER);
+ logger.info("\n" + Constants.getASCIIArt());
System.setProperty("java.awt.headless", "true");
--
Gitblit v1.9.1