Claude/cpu guard script dn d8u - #120
Merged
Merged
Conversation
…, jq fallback
rw_cpu_guard.sh:
- Add escape_md_v2() helper: escapes all 20 MarkdownV2 special characters
(backslash processed first to prevent double-escaping)
- tg_alert(): escape the full composed text (prefix + caller message) via
escape_md_v2() before sending; switch parse_mode Markdown → MarkdownV2;
raw ${short_cmd} can no longer break message formatting or leak syntax
- CPU tracer: switch ps format 'cmd' → 'args' so the full executable path
and every argument are captured; combined with the existing $5..$NF loop
this gives a complete, delimiter-safe command string in every CSV row
runewager_redeploy.sh:
- _health_check pretty-print cascade: python3 -m json.tool → jq . → raw;
diagnostics never fail when neither pretty-printer is installed
https://claude.ai/code/session_01WpEqAiDbpqnBywMjYXJHf4
…t failure rw_cpu_guard.sh: - CSV header: cmd → args to match the ps field now being recorded runewager_redeploy.sh: - Extract _show_payload() helper: captures formatter output into a variable, then falls back to raw only when output is empty/non-zero; fixes the silent-failure bug where sed's exit code masked python3/jq failures so the || fallback never triggered - Replace three duplicated 'echo | head -20 | sed' blocks with a single call to _show_payload(), keeping the python3 → jq → raw cascade https://claude.ai/code/session_01WpEqAiDbpqnBywMjYXJHf4
…d status Two bugs exposed by the production redeploy on 2026-03-01: 1. Port-conflict crash loop: runewager-bot.service (previously active) has Restart=always / RestartSec=5. After _kill_port freed port 3000 the legacy service restarted ~5 s later and reclaimed the port. When prod-run.sh then started runewager.service it immediately failed with EADDRINUSE → exit 1 crash loop. _stop_bot_service now also stops known legacy service names (runewager-bot, runewager_bot) before the port-kill step so they cannot race back to life and steal the port. 2. Status display masked real service state as "not-found": systemctl is-active exits non-zero for failed/inactive/activating too, so the old `state=$(…) || state="not-found"` showed every non-active state as "not-found" — hiding that the service was actually in "failed". Now the string printed by is-active is captured directly; "not-found" is only set when the command produces empty output (unit truly unknown). https://claude.ai/code/session_01WpEqAiDbpqnBywMjYXJHf4
|
CodeAnt AI is reviewing your PR. Thanks for using CodeAnt! 🎉We're free for open-source projects. if you're enjoying it, help us grow by sharing. Share on X · |
Reviewer's GuideAdds Telegram MarkdownV2-safe alert messaging to rw_cpu_guard, improves CPU spike forensic logging, hardens the bot redeploy script against legacy service port conflicts, makes health-check payload formatting more robust, and makes service status summarization more accurate under systemd. Sequence diagram for Telegram MarkdownV2-safe alert messagingsequenceDiagram
participant rw_cpu_guard as rw_cpu_guard_script
participant tg_alert as tg_alert_function
participant esc as escape_md_v2
participant tg_api as Telegram_Bot_API
rw_cpu_guard->>tg_alert: tg_alert(msg)
tg_alert->>tg_alert: Check TG_BOT_TOKEN and TG_ADMIN_IDS
tg_alert->>tg_alert: Enforce alert cooldown
tg_alert->>esc: escape_md_v2("🛡 [rw_cpu_guard] " + msg)
esc-->>tg_alert: safe_text
tg_alert->>tg_alert: Split TG_ADMIN_IDS into id list
loop for each admin id
tg_alert->>tg_api: sendMessage(chat_id=id, text=safe_text, parse_mode=MarkdownV2)
tg_api-->>tg_alert: HTTP response (ignored)
end
tg_alert-->>rw_cpu_guard: return
Flow diagram for redeploy legacy service handling and health payload formattingflowchart TD
A[Start redeploy] --> B[Stop main bot service
BOT_SERVICE]
B --> C{Any legacy
services active?}
C -->|Yes| D[Loop over legacy names
runewager-bot and runewager_bot]
D --> E{Legacy name
!= BOT_SERVICE
and active?}
E -->|Yes| F[Log warning and
systemctl stop legacy]
E -->|No| G[Skip legacy service]
F --> H[Next legacy]
G --> H
H --> C
C -->|No| I[Proceed to port cleanup
and start bot]
I --> J[Begin health check loop]
J --> K[curl HEALTH_URL
get http_code]
K --> L{http_code == 200?}
L -->|No| M[Sleep and retry
until timeout]
M --> J
L -->|Yes| N[Log bot healthy]
N --> O[Fetch payload
curl HEALTH_URL]
O --> P{python3 available?}
P -->|Yes| Q[_show_payload
with python3 -m json.tool]
P -->|No| R{jq available?}
R -->|Yes| S[_show_payload
with jq .]
R -->|No| T[Print raw payload
first 20 lines]
Q --> U[Health check success]
S --> U
T --> U
U --> V[Summarize services
systemctl is-active
BOT_SERVICE and rw_cpu_guard]
V --> W[If empty output
set state to not-found]
W --> X[End redeploy]
File-Level Changes
Tips and commandsInteracting with Sourcery
Customizing Your ExperienceAccess your dashboard to:
Getting Help
|
|
Warning Rate limit exceeded
⌛ How to resolve this issue?After the wait time has elapsed, a review can be triggered using the We recommend that you space out your commits to avoid hitting the rate limit. 🚦 How do rate limits work?CodeRabbit enforces hourly rate limits for each developer per organization. Our paid plans have higher rate limits than the trial, open-source and free plans. In all cases, we re-allow further reviews after a brief timeout. Please see our FAQ for further information. 📒 Files selected for processing (2)
✨ Finishing Touches🧪 Generate unit tests (beta)
Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out. Comment |
codeant-ai
Bot
added
the
size:S
![sourcery-ai[bot]](https://avatars.githubusercontent.com/in/48477?s=60&v=4){kind=small}
There was a problem hiding this comment.
Hey - I've left some high level feedback:
- The
_show_payloadhelper is defined inside the_health_checkloop and redefined on every iteration; consider hoisting it to a top-level helper to avoid repeated function definition and make it easier to reuse elsewhere. - In
_show_payload,formatted=$(printf '%s' "$text" | $formatter 2>/dev/null)relies on word-splitting for the formatter command; using an array orbash -cto invoke the formatter would avoid subtle bugs if you later pass a formatter with spaces or special characters in its arguments.
Prompt for AI Agents
Please address the comments from this code review:
## Overall Comments
- The `_show_payload` helper is defined inside the `_health_check` loop and redefined on every iteration; consider hoisting it to a top-level helper to avoid repeated function definition and make it easier to reuse elsewhere.
- In `_show_payload`, `formatted=$(printf '%s' "$text" | $formatter 2>/dev/null)` relies on word-splitting for the formatter command; using an array or `bash -c` to invoke the formatter would avoid subtle bugs if you later pass a formatter with spaces or special characters in its arguments.Help me be more useful! Please click 👍 or 👎 on each comment and I'll use the feedback to improve your reviews.
Nitpicks 🔍
|
![codeant-ai[bot]](https://avatars.githubusercontent.com/in/646884?s=60&v=4){kind=small}
Comment on lines
+125
to
+134
| # Stop legacy service names so they can't restart and steal port ${BOT_PORT} | ||
| # while this redeploy is in progress. Failures are non-fatal. | ||
| local _legacy | ||
| for _legacy in "runewager-bot" "runewager_bot"; do | ||
| if [[ "$_legacy" != "$BOT_SERVICE" ]] \ | ||
| && systemctl is-active --quiet "$_legacy" 2>/dev/null; then | ||
| warn "Legacy service '${_legacy}' is running — stopping to prevent port conflict" | ||
| systemctl stop "$_legacy" 2>/dev/null || true | ||
| fi | ||
| done |
There was a problem hiding this comment.
Suggestion: The legacy service stopping block ignores the dry-run flag and calls systemctl stop directly, so running the script with --dry-run will still stop any legacy systemd units, violating the documented "no action" contract for dry runs and potentially causing unexpected service interruption. [logic error]
Severity Level: Major ⚠️
- ⚠️ Dry-run redeploy unexpectedly stops legacy bot services.
- ⚠️ Violates documented "print steps, no action" contract.
- ⚠️ Operators may cause downtime while testing changes.
Suggested change
| # Stop legacy service names so they can't restart and steal port ${BOT_PORT} | |
| # while this redeploy is in progress. Failures are non-fatal. | |
| local _legacy | |
| for _legacy in "runewager-bot" "runewager_bot"; do | |
| if [[ "$_legacy" != "$BOT_SERVICE" ]] \ | |
| && systemctl is-active --quiet "$_legacy" 2>/dev/null; then | |
| warn "Legacy service '${_legacy}' is running — stopping to prevent port conflict" | |
| systemctl stop "$_legacy" 2>/dev/null || true | |
| fi | |
| done | |
| # Stop legacy service names so they can't restart and steal port ${BOT_PORT} | |
| # while this redeploy is in progress. Failures are non-fatal. | |
| local _legacy | |
| for _legacy in "runewager-bot" "runewager_bot"; do | |
| if [[ "$_legacy" != "$BOT_SERVICE" ]] \ | |
| && systemctl is-active --quiet "$_legacy" 2>/dev/null; then | |
| warn "Legacy service '${_legacy}' is running — stopping to prevent port conflict" | |
| if (( DRY_RUN )); then | |
| warn "[DRY-RUN] would stop legacy service '${_legacy}'" | |
| else | |
| systemctl stop "$_legacy" 2>/dev/null || true | |
| fi | |
| fi | |
| done |
Steps of Reproduction ✅
1. On a host where this repo is deployed, ensure a legacy systemd unit is present and
active, e.g. run `systemctl start runewager-bot` so that `systemctl is-active
runewager-bot` returns "active".
2. Execute the redeploy script in dry-run mode: `sudo ./scripts/runewager_redeploy.sh
--dry-run` (entrypoint `main()` in `scripts/runewager_redeploy.sh` near the end of the
file parses `--dry-run` and sets `DRY_RUN=1` before calling `_stop_bot_service`).
3. During STEP 1, function `_stop_bot_service()` at
`scripts/runewager_redeploy.sh:117-135` runs; after handling `$BOT_SERVICE`, it enters the
legacy loop at lines 125-134, where it checks `systemctl is-active --quiet "$_legacy"`
and, if active, prints the warning and executes `systemctl stop "$_legacy" 2>/dev/null ||
true` without consulting `DRY_RUN`.
4. After the script finishes, verify that the legacy service has been stopped by running
`systemctl is-active runewager-bot` and observing it is no longer "active", despite the
script being invoked with `--dry-run` and the header comment advertising `--dry-run #
print steps, no action`.Prompt for AI Agent 🤖
This is a comment left during a code review.
**Path:** scripts/runewager_redeploy.sh
**Line:** 125:134
**Comment:**
*Logic Error: The legacy service stopping block ignores the dry-run flag and calls `systemctl stop` directly, so running the script with `--dry-run` will still stop any legacy systemd units, violating the documented "no action" contract for dry runs and potentially causing unexpected service interruption.
Validate the correctness of the flagged issue. If correct, How can I resolve this? If you propose a fix, implement it and please make it concise.
|
CodeAnt AI finished reviewing your PR. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
User description
Summary by Sourcery
Harden Telegram alerting, CPU forensics logging, and redeploy health checks to be more robust and informative while preventing legacy service port conflicts.
New Features:
Enhancements:
CodeAnt-AI Description
Prevent bot port conflicts during redeploy and record full commands in CPU traces
What Changed
Impact
✅ Prevent redeploy port conflicts and crash loops✅ Clearer health check payloads during redeploy✅ More complete CPU forensics (full command+args recorded)💡 Usage Guide
Checking Your Pull Request
Every time you make a pull request, our system automatically looks through it. We check for security issues, mistakes in how you're setting up your infrastructure, and common code problems. We do this to make sure your changes are solid and won't cause any trouble later.
Talking to CodeAnt AI
Got a question or need a hand with something in your pull request? You can easily get in touch with CodeAnt AI right here. Just type the following in a comment on your pull request, and replace "Your question here" with whatever you want to ask:
This lets you have a chat with CodeAnt AI about your pull request, making it easier to understand and improve your code.
Example
Preserve Org Learnings with CodeAnt
You can record team preferences so CodeAnt AI applies them in future reviews. Reply directly to the specific CodeAnt AI suggestion (in the same thread) and replace "Your feedback here" with your input:
This helps CodeAnt AI learn and adapt to your team's coding style and standards.
Example
Retrigger review
Ask CodeAnt AI to review the PR again, by typing:
Check Your Repository Health
To analyze the health of your code repository, visit our dashboard at https://app.codeant.ai. This tool helps you identify potential issues and areas for improvement in your codebase, ensuring your repository maintains high standards of code health.