opendev/gerrit
Code Issues Proposed changes

SiteProgram: Throw a ProvisionException if database.type is not defined

Browse Source 
Change-Id: If37776b4acace2fe42fd3fb4552a9e260cd93d31
This commit is contained in:
David Pursehouse
2016-03-15 16:53:06 +09:00
parent b4ad02a2ad
commit 6072445a3e
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -45,6 +45,7 @@ import com.google.inject.Injector;
import com.google.inject.Key; import com.google.inject.Key;
import com.google.inject.Module; import com.google.inject.Module;
import com.google.inject.Provider; import com.google.inject.Provider;
import com.google.inject.ProvisionException;
import com.google.inject.TypeLiteral; import com.google.inject.TypeLiteral;
import com.google.inject.name.Named; import com.google.inject.name.Named;
import com.google.inject.name.Names; import com.google.inject.name.Names;
@@ -158,6 +159,10 @@ public abstract class SiteProgram extends AbstractProgram {
dbType = cfg.getString("database", null, "type"); dbType = cfg.getString("database", null, "type");
} }
if (dbType == null) {
throw new ProvisionException("database.type must be defined");
}
final DataSourceType dst = Guice.createInjector(new DataSourceModule(), configModule, final DataSourceType dst = Guice.createInjector(new DataSourceModule(), configModule,
sitePathModule).getInstance( sitePathModule).getInstance(
Key.get(DataSourceType.class, Names.named(dbType.toLowerCase()))); Key.get(DataSourceType.class, Names.named(dbType.toLowerCase())));