From bfa998a3d04e759be555dd8136aaa9450960a879 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Thu, 10 Apr 2014 19:00:04 -0400
Subject: [PATCH] Documentation
---
src/main/java/com/gitblit/manager/RuntimeManager.java | 26 +++++++++++++++++---------
1 files changed, 17 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/gitblit/manager/RuntimeManager.java b/src/main/java/com/gitblit/manager/RuntimeManager.java
index cfb4543..9805701 100644
--- a/src/main/java/com/gitblit/manager/RuntimeManager.java
+++ b/src/main/java/com/gitblit/manager/RuntimeManager.java
@@ -40,23 +40,29 @@
private final ServerStatus serverStatus;
- private TimeZone timezone;
+ private final ServerSettings settingsModel;
private File baseFolder;
- private ServerSettings settingsModel;
+ private TimeZone timezone;
public RuntimeManager(IStoredSettings settings) {
+ this(settings, null);
+ }
+
+ public RuntimeManager(IStoredSettings settings, File baseFolder) {
this.settings = settings;
this.settingsModel = new ServerSettings();
this.serverStatus = new ServerStatus();
+ this.baseFolder = baseFolder == null ? new File("") : baseFolder;
}
@Override
- public RuntimeManager setup() {
- logger.info("Gitblit settings = " + settings.toString());
- logTimezone("JVM", TimeZone.getDefault());
- logTimezone(Constants.NAME, getTimezone());
+ public RuntimeManager start() {
+ logger.info("Basefolder : " + baseFolder.getAbsolutePath());
+ logger.info("Settings : " + settings.toString());
+ logTimezone("JVM timezone: ", TimeZone.getDefault());
+ logTimezone("App timezone: ", getTimezone());
return this;
}
@@ -110,7 +116,9 @@
*/
@Override
public boolean isServingRepositories() {
- return settings.getBoolean(Keys.git.enableGitServlet, true) || (settings.getInteger(Keys.git.daemonPort, 0) > 0);
+ return settings.getBoolean(Keys.git.enableGitServlet, true)
+ || (settings.getInteger(Keys.git.daemonPort, 0) > 0)
+ || (settings.getInteger(Keys.git.sshPort, 0) > 0);
}
/**
@@ -121,7 +129,7 @@
@Override
public TimeZone getTimezone() {
if (timezone == null) {
- String tzid = settings.getString("web.timezone", null);
+ String tzid = settings.getString(Keys.web.timezone, null);
if (StringUtils.isEmpty(tzid)) {
timezone = TimeZone.getDefault();
return timezone;
@@ -135,7 +143,7 @@
SimpleDateFormat df = new SimpleDateFormat("z Z");
df.setTimeZone(zone);
String offset = df.format(new Date());
- logger.info(type + " timezone is " + zone.getID() + " (" + offset + ")");
+ logger.info("{}{} ({})", new Object [] { type, zone.getID(), offset });
}
/**
--
Gitblit v1.9.1