Merge "Revert "Fix handling of interactive/batch users in the QoS filter"" into stable-2.16
This commit is contained in:
@@ -579,14 +579,14 @@ public class Daemon extends SiteProgram {
|
|||||||
|
|
||||||
private Injector createWebInjector() {
|
private Injector createWebInjector() {
|
||||||
final List<Module> modules = new ArrayList<>();
|
final List<Module> modules = new ArrayList<>();
|
||||||
|
if (sshd) {
|
||||||
|
modules.add(new ProjectQoSFilter.Module());
|
||||||
|
}
|
||||||
modules.add(RequestContextFilter.module());
|
modules.add(RequestContextFilter.module());
|
||||||
modules.add(RequestMetricsFilter.module());
|
modules.add(RequestMetricsFilter.module());
|
||||||
modules.add(H2CacheBasedWebSession.module());
|
modules.add(H2CacheBasedWebSession.module());
|
||||||
modules.add(sysInjector.getInstance(GerritAuthModule.class));
|
modules.add(sysInjector.getInstance(GerritAuthModule.class));
|
||||||
modules.add(sysInjector.getInstance(GitOverHttpModule.class));
|
modules.add(sysInjector.getInstance(GitOverHttpModule.class));
|
||||||
if (sshd) {
|
|
||||||
modules.add(new ProjectQoSFilter.Module());
|
|
||||||
}
|
|
||||||
modules.add(AllRequestFilter.module());
|
modules.add(AllRequestFilter.module());
|
||||||
modules.add(sysInjector.getInstance(WebModule.class));
|
modules.add(sysInjector.getInstance(WebModule.class));
|
||||||
modules.add(sysInjector.getInstance(RequireSslFilter.Module.class));
|
modules.add(sysInjector.getInstance(RequireSslFilter.Module.class));
|
||||||
|
|||||||
Reference in New Issue
Block a user