Skip to content

Use method in remoting #233

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

Merged
jglick merged 1 commit into from
Sep 13, 2024
Merged

Use method in remoting #233

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
17 changes: 1 addition & 16 deletions src/main/java/org/jenkinsci/plugins/durabletask/FileMonitoringTask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -580,21 +580,6 @@ private static class StartWatching extends MasterToSlaveFileCallable<Void> {

}

// TODO https://github.com/jenkinsci/remoting/pull/657
private static boolean isClosedChannelException(Throwable t) {
if (t instanceof ClosedChannelException) {
return true;
} else if (t instanceof ChannelClosedException) {
return true;
} else if (t instanceof EOFException) {
return true;
} else if (t == null) {
return false;
} else {
return isClosedChannelException(t.getCause()) || Stream.of(t.getSuppressed()).anyMatch(FileMonitoringTask::isClosedChannelException);
}
}

private static class Watcher implements Runnable {

private final FileMonitoringController controller;
Expand Down Expand Up @@ -667,7 +652,7 @@ private static class Watcher implements Runnable {
}
} catch (Exception x) {
// note that LOGGER here is going to the agent log, not master log
if (isClosedChannelException(x)) {
if (Channel.isClosedChannelException(x)) {
LOGGER.warning(() -> this + " giving up on watching " + controller.controlDir);
} else {
LOGGER.log(Level.WARNING, this + " giving up on watching " + controller.controlDir, x);
Expand Down