From 80c3ef7b8fd0daee7e85beb6b10f8a7a40efb3de Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Thu, 17 Apr 2014 23:08:07 -0400
Subject: [PATCH] [findbugs] Null check on logging merge change in patchset receive pack
---
src/site/setup_go.mkd | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/site/setup_go.mkd b/src/site/setup_go.mkd
index 5d422fa..51ca295 100644
--- a/src/site/setup_go.mkd
+++ b/src/site/setup_go.mkd
@@ -117,13 +117,14 @@
--baseFolder The default base folder for all relative file reference settings
--repositoriesFolder Git Repositories Folder
--userService Authentication and Authorization Service (filename or fully qualified classname)
- --useNio Use NIO Connector else use Socket Connector.
--httpPort HTTP port for to serve. (port <= 0 will disable this connector)
--httpsPort HTTPS port to serve. (port <= 0 will disable this connector)
- --ajpPort AJP port to serve. (port <= 0 will disable this connector)
+ --sshPort SSH Daemon port to serve. (port <= 0 will disable this daemon)
+ --gitPort Git Daemon port to serve. (port <= 0 will disable this daemon)
--alias Alias in keystore of SSL cert to use for https serving
--storePassword Password for SSL (https) keystore.
--shutdownPort Port for Shutdown Monitor to listen on. (port <= 0 will disable this monitor)
+ --dailyLogFile Redirect logging to a rolling, daily log file instead of stdout
--tempFolder Folder for server to extract built-in webapp
**Example**
@@ -135,6 +136,6 @@
You can override Gitblit GO's default Log4j configuration with a command-line parameter to the JVM.
java -Dlog4j.configuration=file:///home/james/log4j.properties -jar gitblit.jar <optional_gitblit_args>
-
-For reference, here is [Gitblit's default Log4j configuration](https://github.com/gitblit/gitblit/blob/master/src/log4j.properties). It includes some file appenders that are disabled by default.
+
+You can not use override the default log4j configuration *AND* specify the `--dailyLogFile` parameter. For reference, here is [Gitblit's default Log4j configuration](https://github.com/gitblit/gitblit/blob/master/src/log4j.properties). It includes some file appenders that are disabled by default.
--
Gitblit v1.9.1