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.

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

Applying codefixes from dev to rc 1.0.0 #235

Closed
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 1 addition & 4 deletions .github/workflows/publish-casper-event-sidecar-deb.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,11 @@ jobs:
include:
- os: ubuntu-20.04
code_name: focal
- os: ubuntu-22.04
code_name: jammy

runs-on: ${{ matrix.os }}

steps:
- uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b #v3.0.2
- uses: Swatinem/rust-cache@cb2cf0cc7c5198d3364b9630e2c3d457f160790c #v1.4.0
with:
key: ${{ matrix.code_name }}

Expand All @@ -45,7 +42,7 @@ jobs:
run: cargo install cargo-deb

- name: Cargo deb
run: cargo deb --no-build --variant ${{ matrix.code_name }}
run: cargo deb --package casper-event-sidecar --variant ${{ matrix.code_name }}

- name: Upload binaries to repo
env:
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -89,9 +89,9 @@ sleep_between_keep_alive_checks_in_seconds = 30
* `delay_between_retries_in_seconds` - The delay between attempts to connect to the node.
* `allow_partial_connection` - Determining whether the Sidecar will allow a partial connection to this node.
* `enable_logging` - This enables the logging of events from the node in question.
* `connection_timeout_in_seconds` - Number of seconds before the connection request times out. Parameter is optional, defaults to 5
* `no_message_timeout_in_seconds` - Number of seconds after which the connection will be restarted if no bytes were received. Parameter is optional, defaults to 120
* `sleep_between_keep_alive_checks_in_seconds` - Optional parameter specifying the time intervals (in seconds) for checking if the connection is still alive. Defaults to 60
* `connection_timeout_in_seconds` - The total time before the connection request times out.
* `no_message_timeout_in_seconds` - Optional parameter that determines after what time of not receiving any bytes from the connection will it be restarted. Defaults to 120
* `sleep_between_keep_alive_checks_in_seconds` - Optional parameter which determines in what intervals will the liveliness of the connection be checked. Defaults to 60

### Storage

Expand Down
4 changes: 0 additions & 4 deletions sidecar/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -85,10 +85,6 @@ Package for Casper Event Sidecar
unit-scripts = "../resources/maintainer_scripts/casper_event_sidecar"
restart-after-upgrade = true

[package.metadata.deb.variants.bionic]
name = "casper-event-sidecar"
revision = "0+bionic"

[package.metadata.deb.variants.focal]
name = "casper-event-sidecar"
revision = "0+focal"
2 changes: 2 additions & 0 deletions sidecar/src/admin_server.rs
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ async fn metrics_handler() -> Result<impl Reply, Rejection> {
Ok(res_custom)
}

#[cfg(target_os = "linux")]
#[cfg(test)]
mod tests {
use crate::{admin_server::run_server, types::config::AdminServerConfig};
Expand All @@ -71,6 +72,7 @@ mod tests {

#[tokio::test(flavor = "multi_thread", worker_threads = 4)]
async fn given_config_should_start_admin_server() {
// This test should only run on linux os because only linux offers the "process" metrics
let port = pick_unused_port().unwrap();
let request_url = format!("http://localhost:{}/metrics", port);
let admin_config = AdminServerConfig {
Expand Down
Loading