New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Rspamd: script stabilization pt. 1 #3261
Conversation
48af884
to
54d0557
Compare
9434d23
to
da6d793
Compare
I am presently reviewing / investigating the It might be wise to merge #3266 so that |
I had hoped @casperklein could provide a review for this PR. I thought I just assigned a review to you @polarathene in #3257, but it seems like my figers were faster than my head.
Although there is no technical issue, I'd really like to get a review in for this PR, because I have already prepared two PRs that are based on changes this PR introduces. I have a bit of time pressure because I will be starting my masters thesis soon, and this will take up most of my time then, hence I'd like to get these changes out. I will merge #3266 now though, and rebase this PR, because fixing UPDTAE: Rebasing done. |
da6d793
to
49a63c4
Compare
I believe similar to me he has low review capacity 😅 It is much easier when the scope is minimized. I know as the contributor it's annoying juggling multiple PRs, but on the reviewer end it's faster when the diff is small and focused. I haven't looked into this one yet, so not saying that's not the case, but you have had a habit of bundling changes for convenience that could be smaller PRs (like the
At a glance, the PR is only touching rspamd files/docs/tests, besides the two extra helper methods you added. I am rather relaxed on review with rspamd work while you iterate on it. Instead I've only actually noticed issues at a later point and raised them when I became aware of them. I don't mind approving this and reviewing it after the fact since the scope only affects rspamd, there isn't as much risk impact elsewhere in the stack for me to consider 👍
I think @casperklein will share the same stance for this PR, merging should be ok and we can still provide review. Likewise, review of any follow-up work may take some time, so hopefully it's not too much more to review. I think you mostly wanted to address some rspamd PRs and publish v12.1, and presumably get v13 out before your masters thesis starts? If those PRs keep changes isolated to rspamd, it's easier for me to approve with a deferred review (but realistically, right now I may not manage to get around to it). If the review process is adding too much friction, we could consider bypassing review for your PRs, but I think the quality control / feedback of reviews is better than rushing changes. I try to make time for changes that are potentially disruptive / complicated so we avoid breaking things. I would love to be more involved in the rspamd feature work, but can't afford more distractions 😅 Usual "reduced availability" noteI need to focus on clearing my backlog which will take me quite a while (and depending on circumstances may not be easy), so the less time I need to put into reviews / collaboration, the better for me atm. This project alone, I've got some fairly old WIP PR items and TODO issues that I'd like to resolve 😬 |
👍🏼
Just v12.1.0. v13 can take all the time it needs.
All the follow-up PRs are just for Rspamd, and they do not touch other parts :) I thought about merging without reviews, but I'm really not sure about such a thing. I think the changes (including this PR) until v12.1.0 are approximately +450/-100 lines. Many additions because I wrote more tests (
Rspamd will see just 1 change one could consider breaking (moving a single file location, upcoming PR), but the log shows a warning and all is well. Other than that, it's cleanup, more checks, and improving docs. Few new features are added now (just the |
Hey @georglauterbach, if you are in urge with your thesis, then go merge it 😎 Otherwise I will promise to review at saturday, maybe tomorrow.
👍 |
I guess this is absolutely fine :) I have a few changes that are basically just adding tests, and I'll not be bothering you with these afterwards :) |
and also added tests. I also adjusted the test file to not run in a container, because there is no need. This also decreases test time, which, in turn, increases maintainers' happiness.
I added the helpers from the previous commit to the Rspamd setup to make the whole setup more robust, and indicate to the user that an ENV variable's value is incorrect. While we did not issues for this in the past, I believe it to be worthwhile for the future.
This dir is canonical with DMS's optional configuration dirs, as it lives in well-known volume mounts. Hence, users will not need to adjust `/etc/rspamd/override.d` manually anymore, or mount a volume to this place. The docs explain this now, but the DKIM page needs a slight update on this too I guess. I will follow-up here.
b161382
to
b2a4ce8
Compare
LGTM, just some suggestions/questions: First I thought, you forgot the dollar sign when passing the variable value to the function: But then I saw this: function _env_var_expect_zero_or_one() {
local ENV_VAR_NAME=${1}
[[ ${!ENV_VAR_NAME} =~ ^(0|1)$ ]] && return 0 What's your rational for using |
Because it allows the log message that comes afterwards: logging the name of the variable that "violates the contract" is something I wanted, so users know exactly which variable is set incorrectly:) |
I see, that makes sense. Are you going to remove the unnecessary |
Yes, just haven't had the opportunity yet :) |
-> removed `export` where not needed
FYI: I enabled auto-merge, so when you approve, this PR will be merged. |
Documentation preview for this PR is ready! 🎉 Built with commit: 628a8fb |
Description
Related to #3249
Closes #3266
Type of change
Checklist:
docs/
)