Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Modify message for failed servers #425

Merged
merged 1 commit into from
Jan 4, 2023
Merged

Modify message for failed servers #425

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/main/java/org/simplify4u/plugins/keyserver/PGPKeysCache.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -398,7 +398,7 @@ PGPPublicKeyRing execute(KeyServerExecutor executor) throws IOException {
}
}

LOGGER.error("All servers from list was failed");
LOGGER.error("All servers from list failed");
throw lastException;
}
}
Expand Down Expand Up @@ -428,7 +428,7 @@ PGPPublicKeyRing execute(KeyServerExecutor executor) throws IOException {
}
}

LOGGER.error("All servers from list was failed");
LOGGER.error("All servers from list failed");
throw lastException;
}
}
Expand Down
6 changes: 3 additions & 3 deletions src/test/java/org/simplify4u/plugins/keyserver/PGPKeysCacheTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -529,7 +529,7 @@ public void throwsExceptionForAllFailedExecute(KeyServerList keyServerList) thro

verify(keysCacheLogger).warn(eq("{} throw exception: {} - {} try next client"), eq(client1), eq("Fallback test1"), anyString());
verify(keysCacheLogger).warn(eq("{} throw exception: {} - {} try next client"), eq(client2), eq("Fallback test2"), anyString());
verify(keysCacheLogger).error("All servers from list was failed");
verify(keysCacheLogger).error("All servers from list failed");
verifyNoMoreInteractions(keysCacheLogger);

verify(client1).copyKeyToOutputStream(KEY_ID_1, null, null);
Expand Down Expand Up @@ -559,7 +559,7 @@ public void throwsPGPKeyNotFoundWhenKeyNotFoundOnLastServer(KeyServerList keySer

verify(keysCacheLogger).warn(eq("{} throw exception: {} - {} try next client"), eq(client1), isNull(), anyString());
verify(keysCacheLogger).warn(eq("{} throw exception: {} - {} try next client"), eq(client2), isNull(), anyString());
verify(keysCacheLogger).error("All servers from list was failed");
verify(keysCacheLogger).error("All servers from list failed");
verifyNoMoreInteractions(keysCacheLogger);

verify(client1).copyKeyToOutputStream(KEY_ID_1, null, null);
Expand Down Expand Up @@ -589,7 +589,7 @@ public void throwsPGPKeyNotFoundWhenKeyNotFoundOnFirstServer(KeyServerList keySe

verify(keysCacheLogger).warn(eq("{} throw exception: {} - {} try next client"), eq(client1), isNull(), anyString());
verify(keysCacheLogger).warn(eq("{} throw exception: {} - {} try next client"), eq(client2), isNull(), anyString());
verify(keysCacheLogger).error("All servers from list was failed");
verify(keysCacheLogger).error("All servers from list failed");
verifyNoMoreInteractions(keysCacheLogger);

verify(client1).copyKeyToOutputStream(KEY_ID_1, null, null);
Expand Down