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

cells: always try to re-establish dead tunnel, unless stopped #7713

Merged
merged 1 commit into from
Dec 12, 2024
Merged

cells: always try to re-establish dead tunnel, unless stopped #7713

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
13 changes: 9 additions & 4 deletions modules/cells/src/main/java/dmg/cells/network/LocationManagerConnector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,8 +102,8 @@ public void run() {
} finally {
getNucleus().kill(tunnel.getCellName());
}
} catch (InterruptedIOException | ClosedByInterruptException e) {
throw e;
} catch (InterruptedIOException | InterruptedException | ClosedByInterruptException e) {
_log.warn("Connection to {} ({}) interrupted. Reason: {}", _domain, _address, e.toString());
} catch (ExecutionException | IOException e) {
String error = Exceptions.meaningfulMessage(Throwables.getRootCause(e));
_log.warn(AlarmMarkerFactory.getMarker(PredefinedAlarm.LOCATION_MANAGER_FAILURE,
Expand All @@ -116,11 +116,16 @@ public void run() {
_status = "Sleeping";
long sleep = random.nextInt(16000) + 4000;
_log.warn("Sleeping {} seconds", sleep / 1000);
Thread.sleep(sleep);
try {
Thread.sleep(sleep);
} catch (InterruptedException e) {
// restore interrupted status
Thread.currentThread().interrupt();
}
}
} catch (InterruptedIOException | InterruptedException | ClosedByInterruptException ignored) {
} finally {
NDC.pop();
_thread = null;
_status = "Terminated";
}
}
Expand Down
Loading