From 302df69068e0e67993fbf38abfc2f5e266d35c68 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Tue, 30 Apr 2013 09:09:33 -0400
Subject: [PATCH] Include alternate user services in WAR and Express builds
---
src/main/java/com/gitblit/GitBlit.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/gitblit/GitBlit.java b/src/main/java/com/gitblit/GitBlit.java
index 0f1b73b..4fa6f4f 100644
--- a/src/main/java/com/gitblit/GitBlit.java
+++ b/src/main/java/com/gitblit/GitBlit.java
@@ -3227,14 +3227,15 @@
protected void configureGitDaemon() {
String bindInterface = settings.getString(Keys.git.daemonBindInterface, "localhost");
- int port = settings.getInteger(Keys.git.daemonPort, GitDaemon.DEFAULT_PORT);
+ int port = settings.getInteger(Keys.git.daemonPort, 0);
if (port > 0) {
try {
gitDaemon = new GitDaemon(bindInterface, port, getRepositoriesFolder());
gitDaemon.start();
logger.info(MessageFormat.format("Git daemon is listening on {0}:{1,number,0}", bindInterface, port));
} catch (IOException e) {
- logger.error(MessageFormat.format("Failed to start Git daemon on {0}:{1,number.0}", bindInterface, port), e);
+ gitDaemon = null;
+ logger.error(MessageFormat.format("Failed to start Git daemon on {0}:{1,number,0}", bindInterface, port), e);
}
}
}
--
Gitblit v1.9.1