From ec58c0ab9be6cf1976a5393eb9743ada12387dc9 Mon Sep 17 00:00:00 2001 From: Andras Schmelczer Date: Sat, 29 Mar 2025 10:07:58 +0000 Subject: [PATCH] Fix E2E --- .github/workflows/e2e.yml | 2 +- backend/sync_server/src/cli/args.rs | 2 -- backend/sync_server/src/main.rs | 1 + frontend/sync-client/src/sync-operations/syncer.ts | 2 +- 4 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml index 049762bd..ad7523f5 100644 --- a/.github/workflows/e2e.yml +++ b/.github/workflows/e2e.yml @@ -38,7 +38,7 @@ jobs: - name: E2E tests run: | cd backend - RUST_BACKTRACE=1 cargo run -p sync_server config-e2e.yml & + cargo run -p sync_server config-e2e.yml --color never & cd .. scripts/update-api-types.sh diff --git a/backend/sync_server/src/cli/args.rs b/backend/sync_server/src/cli/args.rs index 7c2976bc..603d8d15 100644 --- a/backend/sync_server/src/cli/args.rs +++ b/backend/sync_server/src/cli/args.rs @@ -17,9 +17,7 @@ pub struct Args { #[arg( long, - require_equals = true, value_name = "WHEN", - num_args = 0..=1, default_value_t = ColorWhen::Auto, default_missing_value = "always", value_enum diff --git a/backend/sync_server/src/main.rs b/backend/sync_server/src/main.rs index 4c62066e..b3989b0c 100644 --- a/backend/sync_server/src/main.rs +++ b/backend/sync_server/src/main.rs @@ -52,6 +52,7 @@ fn set_up_logging(args: &Args) -> Result<(), SyncServerError> { .map_err(init_error)?; let use_colors = args.color.use_colors(); + let is_debug_mode = args.verbose.log_level_filter() >= log::LevelFilter::Debug; tracing_subscriber::fmt() diff --git a/frontend/sync-client/src/sync-operations/syncer.ts b/frontend/sync-client/src/sync-operations/syncer.ts index 3a956874..7bad88e4 100644 --- a/frontend/sync-client/src/sync-operations/syncer.ts +++ b/frontend/sync-client/src/sync-operations/syncer.ts @@ -295,7 +295,7 @@ export class Syncer { }; this.applyRemoteChangesWebSocket.onclose = (event): void => { - this.logger.error( + this.logger.warn( `WebSocket closed with code ${event.code}: ${event.reason}` ); this.webSocketStatusChangeListeners.forEach((listener) => {