intelmq icon indicating copy to clipboard operation
intelmq copied to clipboard

intelmqctl: On stop wait longer for bots to be stopped

Open Lukas-Heindl opened this issue 8 months ago • 8 comments

fixes certtools/intelmq#2595

retry multiple times on intelmqctl stop to check if bots really stopped, since the bots might take longer to stop. Using retry in constrast to increasing the sleep_time keeps the delay short in case the bots did already stop.

Note: I intend to make at least the amount of retries performed configurable so that if the current total sleep_time of 4.75 seconds does not suffice for some users they are able to increase it.

Lukas-Heindl avatar Apr 11 '25 09:04 Lukas-Heindl

the 3.10 pytest fail is unrelated (see #2602)

sebix avatar Apr 17 '25 06:04 sebix

I put quite some comments in there. Looking at the other code, I see much less comments. If I should shrink the comments just let me know.

Lukas-Heindl avatar Apr 17 '25 09:04 Lukas-Heindl

If I should shrink the comments just let me know.

Please not, inline comments are great :)

sebix avatar Apr 17 '25 09:04 sebix

Alright then. The tests (that shall pass) pass. Any additional feedback? (also notify if not, so I can squash the commits into one commit)

Lukas-Heindl avatar Apr 17 '25 09:04 Lukas-Heindl

Is there something still blocking the merge? (please don't feel pressured, I just want to avoid this got lost in the whole fixing the pytest pipelines issue)

Lukas-Heindl avatar May 06 '25 12:05 Lukas-Heindl

Friendly reminder for this PR.

Lukas-Heindl avatar May 27 '25 10:05 Lukas-Heindl

Is there something still blocking the merge? (please don't feel pressured, I just want to avoid this got lost in the whole fixing the pytest pipelines issue)

A code review and testing (+ changelog entry, but that's minor). Most of us do that work honorary, so it's sometimes hard to find the time.

sebix avatar May 28 '25 05:05 sebix

Alright 👍

I know finding times in the free time for such things is always hard. Personally I also always say contributing to OSS is not supposed to make your live more stressfull, instead it is supposed to be fun. So I didn't want to bother you, it's really mostly about avoiding this PR getting lost (I know that edge is sometimes sharp)

Lukas-Heindl avatar Jun 02 '25 09:06 Lukas-Heindl

Oh yes. In the last iteration I removed the update to botnet_status accidentally. It is back in so the issue should be fixed now.

(I'm only updating the bot_ids in stopped_but_still_running_bots as the others are not expected to change in the meantime (as far as I thought this through). But we can easily iterate over all bots for this update.)

Lukas-Heindl avatar Aug 18 '25 14:08 Lukas-Heindl

rebased on develop and added a changelog entry

sebix avatar Aug 18 '25 19:08 sebix

Thank you for your contribution and especially for your patience!

The patch will be included in the next IntelMQ release coming end of week.

sebix avatar Aug 18 '25 19:08 sebix

Thanks for reviewing and improving the quality of the contribution.

Having the changes so soon (with the new release, so without installing from some other branch or so) is also quite nice 👍

Lukas-Heindl avatar Aug 19 '25 07:08 Lukas-Heindl