-
Notifications
You must be signed in to change notification settings - Fork 28
feat: add a --quiet flag for deploy commands
#828
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
Open
joshyam-k
wants to merge
5
commits into
main
Choose a base branch
from
feat/deploy-quiet
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -39,7 +39,7 @@ | |
| from .environment import Environment | ||
| from .environment_r import REnvironment | ||
| from .exception import RSConnectException | ||
| from .log import VERBOSE, logger | ||
| from .log import VERBOSE, console_logger, logger | ||
| from .models import AppMode, AppModes | ||
|
|
||
| line_width = 45 | ||
|
|
@@ -58,6 +58,12 @@ def cli_feedback(label: str, stderr: bool = False): | |
| vs. internal errors (prefixed with 'Internal Error'). In verbose mode, | ||
| tracebacks will be emitted for internal errors. | ||
| """ | ||
| if logger.quiet: | ||
| # Quiet mode: suppress the step label and [OK] line so stdout stays | ||
| # reserved for the content URL; errors are routed to stderr. | ||
| label = "" | ||
| stderr = True | ||
|
|
||
| if label: | ||
| pad = line_width - len(label) | ||
| click.secho(label + "... " + " " * pad, nl=False, err=stderr) | ||
|
|
@@ -85,17 +91,35 @@ def failed(err: str): | |
| logger.set_in_feedback(False) | ||
|
|
||
|
|
||
| def set_verbosity(verbose: int): | ||
| """Set the verbosity level based on a passed flag | ||
| # Maps a verbosity level to the (RSLogger level, console_logger level) it sets. | ||
| # Level -1 is quiet: RSLogger drops step/progress lines below WARNING and | ||
| # console_logger drops @cls_logged step labels and [OK] lines below ERROR, so | ||
| # only warnings/errors and the final content URL survive. Levels 0/1/2 are | ||
| # normal/verbose/debug; anything above 2 clamps to debug. | ||
| _VERBOSITY_LEVELS = { | ||
| -1: (logging.WARNING, logging.ERROR), | ||
| 0: (logging.INFO, logging.DEBUG), | ||
| 1: (VERBOSE, logging.DEBUG), | ||
| 2: (logging.DEBUG, logging.DEBUG), | ||
| } | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I am not following the distinction between logger and console_logger |
||
|
|
||
|
|
||
| :param verbose: boolean specifying verbose or not | ||
| def set_verbosity(verbose: int, quiet: bool = False): | ||
| """Set the verbosity level based on the passed flags | ||
|
|
||
| :param verbose: verbosity count (0 = normal, 1 = verbose, 2+ = debug) | ||
| :param quiet: emit only the final content URL on stdout; warnings and errors still go to stderr | ||
| """ | ||
| if verbose == 0: | ||
| logger.setLevel(logging.INFO) | ||
| elif verbose == 1: | ||
| logger.setLevel(VERBOSE) | ||
| else: | ||
| logger.setLevel(logging.DEBUG) | ||
| level = -1 if quiet else min(verbose, 2) | ||
| logger_level, console_level = _VERBOSITY_LEVELS[level] | ||
| # Set quiet state (also undoing any left over from an earlier invocation in | ||
| # the same process) before validating the flags so that even the | ||
| # flag-conflict error below lands on stderr, not stdout. | ||
| logger.set_quiet(quiet) | ||
| logger.setLevel(logger_level) | ||
| console_logger.setLevel(console_level) | ||
| if quiet and verbose: | ||
| raise RSConnectException("--quiet cannot be used together with -v/--verbose.") | ||
|
|
||
|
|
||
| def _verify_server(connect_server: api.RSConnectServer): | ||
|
|
||
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
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
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
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
Oops, something went wrong.
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
is this leftover from something?