opendev/gerrit
Code Issues Proposed changes

ReceiveCommits: Factor repeated "internal server error" text to a constant

Browse Source 
Change-Id: I05b70756e69f4106143276dbfbf17de4fc4a6562
This commit is contained in:
David Pursehouse
2020-02-27 19:40:21 +09:00
parent 3519637944
commit 26f7ee61bf
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
java/com/google/gerrit/server/git/receive/ReceiveCommits.java
View File

@@ -226,6 +226,7 @@ class ReceiveCommits {
private static final String CANNOT_DELETE_CHANGES = "Cannot delete from '" + REFS_CHANGES + "'"; private static final String CANNOT_DELETE_CHANGES = "Cannot delete from '" + REFS_CHANGES + "'";
private static final String CANNOT_DELETE_CONFIG = private static final String CANNOT_DELETE_CONFIG =
"Cannot delete project configuration from '" + RefNames.REFS_CONFIG + "'"; "Cannot delete project configuration from '" + RefNames.REFS_CONFIG + "'";
private static final String INTERNAL_SERVER_ERROR = "internal server error";
interface Factory { interface Factory {
ReceiveCommits create( ReceiveCommits create(
@@ -508,7 +509,7 @@ class ReceiveCommits {
Task commandProgress = progress.beginSubTask("refs", UNKNOWN); Task commandProgress = progress.beginSubTask("refs", UNKNOWN);
commands = commands.stream().map(c -> wrapReceiveCommand(c, commandProgress)).collect(toList()); commands = commands.stream().map(c -> wrapReceiveCommand(c, commandProgress)).collect(toList());
processCommandsUnsafe(commands, progress); processCommandsUnsafe(commands, progress);
rejectRemaining(commands, "internal server error"); rejectRemaining(commands, INTERNAL_SERVER_ERROR);
// This sends error messages before the 'done' string of the progress monitor is sent. // This sends error messages before the 'done' string of the progress monitor is sent.
// Currently, the test framework relies on this ordering to understand if pushes completed // Currently, the test framework relies on this ordering to understand if pushes completed
@@ -654,7 +655,7 @@ class ReceiveCommits {
logger.atFine().log("Added %d additional ref updates", added); logger.atFine().log("Added %d additional ref updates", added);
bu.execute(); bu.execute();
} catch (UpdateException | RestApiException e) { } catch (UpdateException | RestApiException e) {
rejectRemaining(cmds, "internal server error"); rejectRemaining(cmds, INTERNAL_SERVER_ERROR);
logger.atFine().withCause(e).log("update failed:"); logger.atFine().withCause(e).log("update failed:");
} }
@@ -838,7 +839,7 @@ class ReceiveCommits {
reject(magicBranchCmd, e.getMessage()); reject(magicBranchCmd, e.getMessage());
} catch (RestApiException | IOException e) { } catch (RestApiException | IOException e) {
logger.atSevere().withCause(e).log("Can't insert change/patch set for %s", project.getName()); logger.atSevere().withCause(e).log("Can't insert change/patch set for %s", project.getName());
reject(magicBranchCmd, "internal server error: " + e.getMessage()); reject(magicBranchCmd, String.format("%s: %s", INTERNAL_SERVER_ERROR, e.getMessage()));
} }
if (magicBranch != null && magicBranch.submit) { if (magicBranch != null && magicBranch.submit) {
@@ -1774,7 +1775,7 @@ class ReceiveCommits {
} catch (IOException e) { } catch (IOException e) {
logger.atWarning().withCause(e).log( logger.atWarning().withCause(e).log(
"Project %s cannot read %s", project.getName(), id.name()); "Project %s cannot read %s", project.getName(), id.name());
reject(cmd, "internal server error"); reject(cmd, INTERNAL_SERVER_ERROR);
return; return;
} }
} }
@@ -1789,7 +1790,7 @@ class ReceiveCommits {
} catch (IOException ex) { } catch (IOException ex) {
logger.atWarning().withCause(ex).log( logger.atWarning().withCause(ex).log(
"Error walking to %s in project %s", destBranch, project.getName()); "Error walking to %s in project %s", destBranch, project.getName());
reject(cmd, "internal server error"); reject(cmd, INTERNAL_SERVER_ERROR);
return; return;
} }
@@ -2221,7 +2222,7 @@ class ReceiveCommits {
logger.atFine().log("Finished updating groups from GroupCollector"); logger.atFine().log("Finished updating groups from GroupCollector");
} catch (OrmException e) { } catch (OrmException e) {
logger.atSevere().withCause(e).log("Error collecting groups for changes"); logger.atSevere().withCause(e).log("Error collecting groups for changes");
reject(magicBranch.cmd, "internal server error"); reject(magicBranch.cmd, INTERNAL_SERVER_ERROR);
} }
return newChanges; return newChanges;
} }
@@ -2514,11 +2515,11 @@ class ReceiveCommits {
} catch (OrmException err) { } catch (OrmException err) {
logger.atSevere().withCause(err).log( logger.atSevere().withCause(err).log(
"Cannot read database before replacement for project %s", project.getName()); "Cannot read database before replacement for project %s", project.getName());
rejectRemainingRequests(replaceByChange.values(), "internal server error"); rejectRemainingRequests(replaceByChange.values(), INTERNAL_SERVER_ERROR);
} catch (IOException | PermissionBackendException err) { } catch (IOException | PermissionBackendException err) {
logger.atSevere().withCause(err).log( logger.atSevere().withCause(err).log(
"Cannot read repository before replacement for project %s", project.getName()); "Cannot read repository before replacement for project %s", project.getName());
rejectRemainingRequests(replaceByChange.values(), "internal server error"); rejectRemainingRequests(replaceByChange.values(), INTERNAL_SERVER_ERROR);
} }
logger.atFine().log("Read %d changes to replace", replaceByChange.size()); logger.atFine().log("Read %d changes to replace", replaceByChange.size());