From 8963aa43c9a5624ab3897e1dba085327e06d2a64 Mon Sep 17 00:00:00 2001 From: Erik Taubeneck Date: Wed, 25 Sep 2024 16:17:10 -0700 Subject: [PATCH 1/3] preserve helper logs on bounce --- etc/start_helper_sidecar.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/etc/start_helper_sidecar.sh b/etc/start_helper_sidecar.sh index 56f3cd8..bab81b0 100755 --- a/etc/start_helper_sidecar.sh +++ b/etc/start_helper_sidecar.sh @@ -15,4 +15,5 @@ helper_port=$5 sidecar_port=$6 identity=$7 -nohup draft run-helper-sidecar --config_path "$config_path" --root_path "$root_path" --helper_domain "$helper_domain" --sidecar_domain "$sidecar_domain" --helper_port "$helper_port" --sidecar_port "$sidecar_port" --identity "$identity" > .draft/logs/helper_sidecar.log 2>&1 & echo $! > $pid_file +log_file=".draft/logs/helper_sidecar_$(date "+%Y-%m-%d_%H-%M-%S").log" +nohup draft run-helper-sidecar --config_path "$config_path" --root_path "$root_path" --helper_domain "$helper_domain" --sidecar_domain "$sidecar_domain" --helper_port "$helper_port" --sidecar_port "$sidecar_port" --identity "$identity" > "$log_file" 2>&1 & echo $! > $pid_file From 3e7f011585ed6cd859170eea191eaeeb3cdf6e6f Mon Sep 17 00:00:00 2001 From: Erik Taubeneck Date: Wed, 25 Sep 2024 16:47:00 -0700 Subject: [PATCH 2/3] add = to nextjs version --- server/package-lock.json | 2 +- server/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/server/package-lock.json b/server/package-lock.json index 240e925..08bb50c 100644 --- a/server/package-lock.json +++ b/server/package-lock.json @@ -17,7 +17,7 @@ "chartjs-adapter-spacetime": "^1.0.1", "clsx": "^2.0.0", "haikunator": "^2.1.2", - "next": "^14.2.11", + "next": "=14.2.11", "octokit": "^3.1.2", "pm2": "^5.4.1", "react": "^18", diff --git a/server/package.json b/server/package.json index 1d0f3d1..fc226ef 100644 --- a/server/package.json +++ b/server/package.json @@ -24,7 +24,7 @@ "chartjs-adapter-spacetime": "^1.0.1", "clsx": "^2.0.0", "haikunator": "^2.1.2", - "next": "14.2.11", + "next": "=14.2.11", "octokit": "^3.1.2", "pm2": "^5.4.1", "react": "^18", From ef519b625bd172b15ef507207af352ed1049371d Mon Sep 17 00:00:00 2001 From: Erik Taubeneck Date: Wed, 25 Sep 2024 19:07:18 -0700 Subject: [PATCH 3/3] pylint error name change --- sidecar/app/routes/start.py | 6 ++++-- sidecar/cli/cli.py | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/sidecar/app/routes/start.py b/sidecar/app/routes/start.py index b758e91..0d59fb7 100644 --- a/sidecar/app/routes/start.py +++ b/sidecar/app/routes/start.py @@ -61,6 +61,8 @@ def demo_logger( return {"message": "Process started successfully", "query_id": query_id} +# pylint: disable=too-many-arguments +# pylint: disable=too-many-positional-arguments @router.post("/ipa-helper/{query_id}") def start_ipa_helper( query_id: str, @@ -73,7 +75,6 @@ def start_ipa_helper( background_tasks: BackgroundTasks, request: Request, ): - # pylint: disable=too-many-arguments query_manager = request.app.state.QUERY_MANAGER check_capacity(query_manager) @@ -153,6 +154,8 @@ def iterfile(): ) +# pylint: disable=too-many-arguments +# pylint: disable=too-many-positional-arguments @router.post("/ipa-query/{query_id}") def start_ipa_query( query_id: str, @@ -165,7 +168,6 @@ def start_ipa_query( background_tasks: BackgroundTasks, request: Request, ): - # pylint: disable=too-many-arguments query_manager = request.app.state.QUERY_MANAGER check_capacity(query_manager) diff --git a/sidecar/cli/cli.py b/sidecar/cli/cli.py index 7f89aa4..dd47463 100644 --- a/sidecar/cli/cli.py +++ b/sidecar/cli/cli.py @@ -124,7 +124,7 @@ def start_traefik_local_command( return Command(cmd=cmd, env=env) -# pylint: disable=too-many-arguments +# pylint: disable=too-many-positional-arguments @cli.command @click.option( "--config_path", @@ -164,7 +164,7 @@ def run_helper_sidecar( start_commands_parallel([sidecar_command, traefik_command]) -# pylint: disable=too-many-arguments +# pylint: disable=too-many-positional-arguments @cli.command @click.option( "--config_path",