Skip to content

fix(server): Log when recovering from network outages #918

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
merged 3 commits into from
Jan 28, 2021
Merged

fix(server): Log when recovering from network outages #918

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a69307b
fix(server): Log when recovering from network outages
jan-auer Jan 28, 2021
9a521c3
meta: Changelog
jan-auer Jan 28, 2021
357ec95
Merge branch 'master' into fix/network-outage-message
jan-auer Jan 28, 2021
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: 4 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@

- By adding `.no-cache` to the DSN key, Relay refreshes project configuration caches immediately. This allows to apply changed settings instantly, such as updates to data scrubbing or inbound filter rules. ([#911](https://github.com/getsentry/relay/pull/911))

**Bug Fixes**:

- Log on INFO level when recovering from network outages. ([#918](https://github.com/getsentry/relay/pull/918))

**Internal**:

- Compatibility mode for pre-aggregated sessions was removed. The feature is now enabled by default in full fidelity. ([#913](https://github.com/getsentry/relay/pull/913))
Expand Down
5 changes: 4 additions & 1 deletion relay-server/src/actors/upstream.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -487,9 +487,12 @@ impl UpstreamRelay {

/// Called when a message to the upstream goes through without a network error.
fn reset_network_error(&mut self) {
if self.outage_backoff.started() {
relay_log::info!("Recovering from network outage.")
}

self.first_error = None;
self.outage_backoff.reset();
relay_log::debug!("Recovering from network outage.")
}

fn upstream_connection_check(&mut self, ctx: &mut Context<Self>) {
Expand Down