opendev/gerrit
Code Issues Proposed changes

SiteProgram: Remove DB-specific error handling

Browse Source 
Change-Id: If44075be88bb5c0e54c1f84c37b3c3fdbbf415b2
This commit is contained in:
Dave Borowitz
2019-01-15 19:30:22 -08:00
parent 024e5aa31d
commit 84845478be
2 changed files with 0 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
java/com/google/gerrit/pgm/util/BUILD
View File

@@ -20,7 +20,6 @@ java_library(
"//lib:args4j", "//lib:args4j",
"//lib:guava", "//lib:guava",
"//lib:gwtorm", "//lib:gwtorm",
"//lib/commons:dbcp",
"//lib/flogger:api", "//lib/flogger:api",
"//lib/guice", "//lib/guice",
"//lib/jgit/org.eclipse.jgit:jgit", "//lib/jgit/org.eclipse.jgit:jgit",

24
java/com/google/gerrit/pgm/util/SiteProgram.java
View File

@@ -27,7 +27,6 @@ import com.google.gerrit.server.config.SitePath;
import com.google.gerrit.server.git.GitRepositoryManagerModule; import com.google.gerrit.server.git.GitRepositoryManagerModule;
import com.google.gerrit.server.schema.SchemaModule; import com.google.gerrit.server.schema.SchemaModule;
import com.google.gerrit.server.securestore.SecureStoreClassName; import com.google.gerrit.server.securestore.SecureStoreClassName;
import com.google.gwtorm.server.OrmException;
import com.google.inject.AbstractModule; import com.google.inject.AbstractModule;
import com.google.inject.CreationException; import com.google.inject.CreationException;
import com.google.inject.Guice; import com.google.inject.Guice;
@@ -38,14 +37,11 @@ import com.google.inject.util.Providers;
import java.nio.file.Files; import java.nio.file.Files;
import java.nio.file.Path; import java.nio.file.Path;
import java.nio.file.Paths; import java.nio.file.Paths;
import java.sql.SQLException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import org.kohsuke.args4j.Option; import org.kohsuke.args4j.Option;
public abstract class SiteProgram extends AbstractProgram { public abstract class SiteProgram extends AbstractProgram {
private static final String CONNECTION_ERROR = "Cannot connect to SQL database";
@Option( @Option(
name = "--site-path", name = "--site-path",
aliases = {"-d"}, aliases = {"-d"},
@@ -127,19 +123,6 @@ public abstract class SiteProgram extends AbstractProgram {
Message first = ce.getErrorMessages().iterator().next(); Message first = ce.getErrorMessages().iterator().next();
Throwable why = first.getCause(); Throwable why = first.getCause();
if (why instanceof SQLException) {
throw die(CONNECTION_ERROR, why);
}
if (why instanceof OrmException
&& why.getCause() != null
&& "Unable to determine driver URL".equals(why.getMessage())) {
why = why.getCause();
if (isCannotCreatePoolException(why)) {
throw die(CONNECTION_ERROR, why.getCause());
}
throw die(CONNECTION_ERROR, why);
}
StringBuilder buf = new StringBuilder(); StringBuilder buf = new StringBuilder();
if (why != null) { if (why != null) {
buf.append(why.getMessage()); buf.append(why.getMessage());
@@ -164,11 +147,4 @@ public abstract class SiteProgram extends AbstractProgram {
protected final String getConfiguredSecureStoreClass() { protected final String getConfiguredSecureStoreClass() {
return getSecureStoreClassName(sitePath); return getSecureStoreClassName(sitePath);
} }
@SuppressWarnings("deprecation")
private static boolean isCannotCreatePoolException(Throwable why) {
return why instanceof org.apache.commons.dbcp.SQLNestedException
&& why.getCause() != null
&& why.getMessage().startsWith("Cannot create PoolableConnectionFactory");
}
} }