Fixes for server command-line #1093
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
* rename `--pidfile` -> `--pidfile-dir` * more correct description of `--runstate-dir`
elprans
reviewed
Jan 13, 2020
edb/server/main.py
Outdated
| @@ -468,7 +475,8 @@ def bump_rlimit_nofile() -> None: | |||
| click.option( | |||
| '--runstate-dir', type=PathPath(), default=None, | |||
| help='directory where UNIX sockets will be created ' | |||
| '("/run" on Linux by default)'), | |||
| '(data-dir or {!r} by default)' | |||
There was a problem hiding this comment.
This will print or 'None' for non-production builds, which isn't very nice. I'd rewrite get_runstate_dir() as:
def _get_runstate_dir_default():
try:
return buildmeta.get_build_metadata_value("RUNSTATE_DIR")
except buildmeta.MetadataError:
return '<data-dir>`There was a problem hiding this comment.
and then:
help = f'directory where UNIX sockets and other temporary '
f'runtime files will be placed ({_get_runstate_dir_default()} by default)'There was a problem hiding this comment.
As far as I understand the --runstate-dir is required if no RUNSTATE_DIR present in buildmeta and not a --devmode. So I'm not sure how far we want to go here with explanations.
There was a problem hiding this comment.
As far as I understand the --runstate-dir is required if no RUNSTATE_DIR present in buildmeta and not a --devmode.
Buildmeta and devmode are complementary, either is supposed to be present.
|
@elprans I think you should cherry-pick this to the a2 branch. |
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.
--pidfile->--pidfile-dir--runstate-dir