Skip to content

Merge master into develop (CLI)#428

Merged
matsduf merged 28 commits intodevelopfrom
master
Mar 5, 2025
Merged

Merge master into develop (CLI)#428
matsduf merged 28 commits intodevelopfrom
master

Conversation

@matsduf
Copy link
Contributor

@matsduf matsduf commented Mar 5, 2025

bzwitt and others added 28 commits September 25, 2024 08:36
Adding fake delegation by means of the --ns command-line option can
sometimes elicit early Zonemaster::Engine log messages that are lost
because the translator isn’t properly initialized at this stage. For
reasons that I do not understand fully yet, this situation causes a
condition where the zonemaster-cli script displays no message at all,
even though it should.

As a workaround for this problem, we set the callback to
Zonemaster::Engine::Logger twice. First, we set it to a closure that
simply appends them to a queue of yet-to-be-printed messages. Right
after the translator is initialized, we print the header and messages
stored by the first callback before switching the callback to the
function we actually wanted to use, which prints the messages on the
terminal.

A brief test shows no unintended side-effects with other output formats
such as JSON. But the run() method in Zonemaster::CLI is long and has a
high cyclomatic complexity, which doesn’t really help with testing!
This looks like it was a mistake after a mixup between two commits: 72f1ec2 and 3985220.
Remove duplicate function calls
Co-authored-by: Marc van der Wal <103426270+marc-vanderwal@users.noreply.github.com>
Tidy French translation file
Co-authored-by: Mattias Päivärinta <mattias@paivarinta.se>
Preparation for v2024.2.1 release (CLI)
Merge release branch into master (CLI)
@matsduf matsduf added this to the v2024.2.1 milestone Mar 5, 2025
@matsduf matsduf merged commit 32a70ee into develop Mar 5, 2025
1 check failed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants