From d5955b60c0f37acee8ed5c3bcb9b9d6d3cec923b Mon Sep 17 00:00:00 2001 From: Felix Ableitner Date: Mon, 14 Dec 2020 18:01:12 +0100 Subject: [PATCH] silence lemmy output in federation logs --- .drone.yml | 6 ------ api_tests/prepare-drone-federation-test.sh | 10 +++++----- lemmy_apub/src/activity_queue.rs | 18 ++++++++---------- 3 files changed, 13 insertions(+), 21 deletions(-) diff --git a/.drone.yml b/.drone.yml index 16a3555ee..1809e0fe7 100644 --- a/.drone.yml +++ b/.drone.yml @@ -102,12 +102,6 @@ services: POSTGRES_USER: lemmy POSTGRES_PASSWORD: password - - name: pictrs - image: asonix/pictrs:v0.2.5-r0 - - - name: iframely - image: dogbin/iframely:latest - volumes: - name: dieselcli temp: {} diff --git a/api_tests/prepare-drone-federation-test.sh b/api_tests/prepare-drone-federation-test.sh index 4010eff66..f59f2c5f5 100755 --- a/api_tests/prepare-drone-federation-test.sh +++ b/api_tests/prepare-drone-federation-test.sh @@ -26,7 +26,7 @@ LEMMY_HOSTNAME=lemmy-alpha:8541 \ LEMMY_FEDERATION__ALLOWED_INSTANCES=lemmy-beta,lemmy-gamma,lemmy-delta,lemmy-epsilon \ LEMMY_SETUP__ADMIN_USERNAME=lemmy_alpha \ LEMMY_SETUP__SITE_NAME=lemmy-alpha \ - target/lemmy_server & + target/lemmy_server >/dev/null 2>&1 & echo "start beta" LEMMY_HOSTNAME=lemmy-beta:8551 \ @@ -35,7 +35,7 @@ LEMMY_HOSTNAME=lemmy-beta:8551 \ LEMMY_FEDERATION__ALLOWED_INSTANCES=lemmy-alpha,lemmy-gamma,lemmy-delta,lemmy-epsilon \ LEMMY_SETUP__ADMIN_USERNAME=lemmy_beta \ LEMMY_SETUP__SITE_NAME=lemmy-beta \ - target/lemmy_server & + target/lemmy_server >/dev/null 2>&1 & echo "start gamma" LEMMY_HOSTNAME=lemmy-gamma:8561 \ @@ -44,7 +44,7 @@ LEMMY_HOSTNAME=lemmy-gamma:8561 \ LEMMY_FEDERATION__ALLOWED_INSTANCES=lemmy-alpha,lemmy-beta,lemmy-delta,lemmy-epsilon \ LEMMY_SETUP__ADMIN_USERNAME=lemmy_gamma \ LEMMY_SETUP__SITE_NAME=lemmy-gamma \ - target/lemmy_server & + target/lemmy_server >/dev/null 2>&1 & echo "start delta" # An instance with only an allowlist for beta @@ -54,7 +54,7 @@ LEMMY_HOSTNAME=lemmy-delta:8571 \ LEMMY_FEDERATION__ALLOWED_INSTANCES=lemmy-beta \ LEMMY_SETUP__ADMIN_USERNAME=lemmy_delta \ LEMMY_SETUP__SITE_NAME=lemmy-delta \ - target/lemmy_server & + target/lemmy_server >/dev/null 2>&1 & echo "start epsilon" # An instance who has a blocklist, with lemmy-alpha blocked @@ -64,7 +64,7 @@ LEMMY_HOSTNAME=lemmy-epsilon:8581 \ LEMMY_FEDERATION__BLOCKED_INSTANCES=lemmy-alpha \ LEMMY_SETUP__ADMIN_USERNAME=lemmy_epsilon \ LEMMY_SETUP__SITE_NAME=lemmy-epsilon \ - target/lemmy_server & + target/lemmy_server >/dev/null 2>&1 & echo "wait for all instances to start" while [[ "$(curl -s -o /dev/null -w '%{http_code}' 'localhost:8541/api/v1/site')" != "200" ]]; do sleep 1; done diff --git a/lemmy_apub/src/activity_queue.rs b/lemmy_apub/src/activity_queue.rs index 1b5ffb937..6c6851a4c 100644 --- a/lemmy_apub/src/activity_queue.rs +++ b/lemmy_apub/src/activity_queue.rs @@ -25,7 +25,7 @@ use lemmy_websocket::LemmyContext; use log::{debug, warn}; use reqwest::Client; use serde::{export::fmt::Debug, Deserialize, Serialize}; -use std::{collections::BTreeMap, future::Future, pin::Pin, env}; +use std::{collections::BTreeMap, env, future::Future, pin::Pin}; use url::Url; /// Sends a local activity to a single, remote actor. @@ -263,13 +263,11 @@ impl ActixJob for SendActivityTask { const BACKOFF: Backoff = Backoff::Exponential(2); fn run(self, state: Self::State) -> Self::Future { - Box::pin(async move { - do_send(self, &state.client).await - }) + Box::pin(async move { do_send(self, &state.client).await }) } } -async fn do_send(task: SendActivityTask, client: &Client) -> Result<(), Error>{ +async fn do_send(task: SendActivityTask, client: &Client) -> Result<(), Error> { let mut headers = BTreeMap::::new(); headers.insert("Content-Type".into(), "application/json".into()); let result = sign_and_send( @@ -280,15 +278,15 @@ async fn do_send(task: SendActivityTask, client: &Client) -> Result<(), Error>{ &task.actor_id, task.private_key.to_owned(), ) - .await; + .await; if let Err(e) = result { warn!("{}", e); return Err(anyhow!( - "Failed to send activity {} to {}", - &task.activity, - task.inbox - )); + "Failed to send activity {} to {}", + &task.activity, + task.inbox + )); } Ok(()) }