Simplify OpenVPN and virtual plugin auto-install checks - #3454
Open
Salvialf wants to merge 2 commits into
Open
Conversation
…ugin::isInstalled
…eSummaryToVirtual
Salvialf
added
the
changelog-fix
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
1 participant
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.
network::dns_create()(OpenVPN) andjeeObject::createSummaryToVirtual()(virtual) both had duplicated install-retry logic between atryblock and itscatch, with a deadif (!is_object($plugin))branch that could never trigger sinceplugin::byId()never returns a non-object without throwing. Both now useplugin::isInstalled()to decide whether an install is needed, removing the duplication and the unreachable branch.plugin::byId()attempt fails after a failed install (previously, an uncaught exception from that second call bypassed the friendly "plugin must be installed" message).createSummaryToVirtual()'ssleep(2)afterdoUpdate()is commented out rather than removed: it dates back to a 2016 fix with no documented root cause,doUpdate()is fully synchronous today, and unlike OpenVPN this flow never callsdependancy_install(). Kept as a comment pending real-world confirmation it's safe to drop entirely.