opendev/gerrit
Code Issues Proposed changes

Merge branch 'stable-2.13'

Browse Source 
* stable-2.13:
  Prevent circular module dependency when running in external container
  Update Documentation of Auto Site Initialization

Change-Id: Ibcbaf7e7b5af58dca5c9b32d068acb81d1fd9781
This commit is contained in:
David Pursehouse
2017-03-01 11:16:17 +09:00
parent 54e55b93bf d66f37c5ab
commit 7e5e551c8c
2 changed files with 12 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
gerrit-war/src/main/java/com/google/gerrit/httpd/WebAppInitializer.java
View File

@@ -272,15 +272,7 @@ public class WebAppInitializer extends GuiceServletContextListener implements Fi
listener().to(ReviewDbDataSourceProvider.class);
}
});
}
modules.add(new DatabaseModule());
modules.add(new DropWizardMetricMaker.ApiModule());
return Guice.createInjector(PRODUCTION, modules);
}
private Injector createCfgInjector() {
final List<Module> modules = new ArrayList<>();
if (sitePath == null) {
// If we didn't get the site path from the system property
// we need to get it from the database, as that's our old
// method of locating the site path on disk.
@@ -297,8 +289,15 @@ public class WebAppInitializer extends GuiceServletContextListener implements Fi
});
modules.add(new GerritServerConfigModule());
}
modules.add(new SchemaModule());
modules.add(new DatabaseModule());
modules.add(new ConfigNotesMigration.Module());
modules.add(new DropWizardMetricMaker.ApiModule());
return Guice.createInjector(PRODUCTION, modules);
}
private Injector createCfgInjector() {
final List<Module> modules = new ArrayList<>();
modules.add(new SchemaModule());
modules.add(SchemaVersionCheck.module());
modules.add(new AuthConfigModule());
return dbInjector.createChildInjector(modules);