caddycmd: Add --keep-backup to upgrade commands
#4387
Merged
Conversation
This file contains 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
francislavoie
force-pushed
the
upgrade-cmd-fixes
branch
4 times, most recently
from
a303a86 to
8ae6a24
Compare
mohammed90
reviewed
Oct 16, 2021
francislavoie
force-pushed
the
upgrade-cmd-fixes
branch
3 times, most recently
from
26e5f51 to
21d1b96
Compare
This is a partial fix for #4057, making it possible to retain the old build of Caddy, in case something went wrong.
The error message "download succeeded, but unable to execute" was repeated, because it was both in the `listModules`/`showVersion` functions and in the calling `upgradeBuild` function. Oversight when this was refactored.
Without this, the cleanup operation would fail with an error message like this: upgrade: download succeeded, but unable to clean up backup binary: remove C:\caddy\caddy.exe.tmp: Access is denied.
francislavoie
force-pushed
the
upgrade-cmd-fixes
branch
from
21d1b96 to
afe012a
Compare
|
Hmm, what if we always left a backup file called |
|
Hmm, I think it's best to clean up by default, because it's not so nice to leave things around in |
mholt
requested changes
Nov 8, 2021
francislavoie
changed the title
--skip-cleanup to upgrade commands--keep-backup to upgrade commands
francislavoie
force-pushed
the
upgrade-cmd-fixes
branch
from
bbeab20 to
cd59a03
Compare
mholt
approved these changes
Nov 8, 2021
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This is a partial fix for #4057, making it possible to retain the old build of Caddy, in case something went wrong, with the
--keep-backupflag.Also includes two additional issues I noticed while reviewing/testing:
There was a duplicate error message being printed if something went wrong when running
caddy list-modulesorcaddy version, just an oversight during the recent refactor.Running
os.Removeto cleanup the renamed backup binary actually fails on Windows, because that's a program trying to remove itself. It's possible to work around this by runningcmd.exe /C del <file>which adds a layer of inversion so that it's actually a different process that deletes the file.