opendev/gerrit
Code Issues Proposed changes

Allow to use --enable-httpd with --slave

Browse Source 
Slave now support running with the http daemon to be able to use git
fetching operations over the http protocol.

Change-Id: I3e7adf0d7ba5ff436394de35d08fba6f3b358aed
This commit is contained in:
Hugo Arès 2014-09-12 09:57:11 -04:00
parent a94cf891d2
commit 045d8a32a7
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Documentation/pgm-daemon.txt
View File

@ -37,7 +37,7 @@ to different values.
--enable-httpd:: --enable-httpd::
--disable-httpd:: --disable-httpd::
Enable (or disable) the internal HTTP daemon, answering Enable (or disable) the internal HTTP daemon, answering
web requests. Enabled by default. web requests. Enabled by default when --slave is not used.
--enable-sshd:: --enable-sshd::
--disable-sshd:: --disable-sshd::
@ -51,7 +51,7 @@ to different values.
or updates existing ones) or link:cmd-review.html[review] or updates existing ones) or link:cmd-review.html[review]
(sets approve marks) are disabled. (sets approve marks) are disabled.
+ +
This option automatically implies '--disable-httpd --enable-sshd'. This option automatically implies '--enable-sshd'.
--console-log:: --console-log::
Send log messages to the console, instead of to the standard Send log messages to the console, instead of to the standard

5
gerrit-pgm/src/main/java/com/google/gerrit/pgm/Daemon.java
View File

@ -119,7 +119,7 @@ public class Daemon extends SiteProgram {
sshd = false; sshd = false;
} }
@Option(name = "--slave", usage = "Support fetch only; implies --disable-httpd") @Option(name = "--slave", usage = "Support fetch only")
private boolean slave; private boolean slave;
@Option(name = "--console-log", usage = "Log to console (not $site_path/logs)") @Option(name = "--console-log", usage = "Log to console (not $site_path/logs)")
@ -191,9 +191,6 @@ public class Daemon extends SiteProgram {
if (!httpd && !sshd) { if (!httpd && !sshd) {
throw die("No services enabled, nothing to do"); throw die("No services enabled, nothing to do");
} }
if (slave && httpd) {
throw die("Cannot combine --slave and --enable-httpd");
}
manager.add(GarbageCollectionLogFile.start(getSitePath())); manager.add(GarbageCollectionLogFile.start(getSitePath()));
if (consoleLog) { if (consoleLog) {