Enhance the transfer-setting command to allow modifying the log level
#946
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
* Improve UI for scan command (#706) * Upgrade go version in go.mod to 1.20 (#732) * Fix lint issues found (#733) * Config transfer - ensure target not older than source (#721) * Update tests environment - nuget and dotnet to version 6 (#734) * Flatten audit graph (#736) * Use gradle-dep-tree with Audit (#719) --------- Co-authored-by: Sara Omari <[email protected]> Co-authored-by: Eyal Ben Moshe <[email protected]> Co-authored-by: Michael Sverdlov <[email protected]> Co-authored-by: Yahav Itzhak <[email protected]>
# Conflicts: # .github/workflows/analysis.yml # go.mod # go.sum # xray/audit/java/gradle.go # xray/commands/audit/generic/auditmanager.go
yahavi
changed the title
transfer-setting command to allow modifying the log leveltransfer-setting command to allow modifying the log level
yahavi
requested changes
Sep 12, 2023
| return currLogLevel | ||
| } | ||
|
|
||
| func (tst *TransferSettingsCommand) validateLogLevelValue(loglevel string) error { |
There was a problem hiding this comment.
Suggested change
| func (tst *TransferSettingsCommand) validateLogLevelValue(loglevel string) error { | |
| func (tst *TransferSettingsCommand) validateLogLevelValue(logLevel string) error { |
| @@ -22,7 +22,8 @@ const ( | |||
| ) | |||
|
|
|||
| type TransferSettings struct { | |||
| ThreadsNumber int `json:"threadsNumber,omitempty"` | |||
| ThreadsNumber int `json:"threadsNumber,omitempty"` | |||
| LogLevel string `json:"logLevel,omitempty"` | |||
There was a problem hiding this comment.
I think it will be safer to work with the same log-level type, using our methods for handling the log levels.
Suggested change
| LogLevel string `json:"logLevel,omitempty"` | |
| LogLevel log.LevelType `json:"logLevel,omitempty"` |
RobiNino
requested changes
Sep 27, 2023
| return err | ||
| } | ||
| log.Output("The settings were saved successfully. It might take a few moments for the new settings to take effect.") | ||
| log.Output(fmt.Sprintf("Note - For Build Info repositories, the number of worker threads will be limited to %d.", utils.MaxBuildInfoThreads)) | ||
| return nil | ||
| } | ||
|
|
||
| func (tst *TransferSettingsCommand) getCurrLogLevel(settings utils.TransferSettings) string { | ||
| currLogLevel := settings.LogLevel |
There was a problem hiding this comment.
Missing a check if settings != nil here.
| } | ||
|
|
||
| func (tst *TransferSettingsCommand) validateLogLevelValue(loglevel string) error { | ||
| if loglevel != "DEBUG" && loglevel != "INFO" && loglevel != "WARN" && loglevel != "ERROR" { |
There was a problem hiding this comment.
I suggest a cleaner approach:
switch loglevel {
case "DEBUG", "INFO", "WARN", "ERROR":
return nil
default:
return errorutils.CheckErrorf("the log level value is invalid")
}
RobiNino
requested changes
Sep 28, 2023
| if err := updateThreads(pcWrapper, buildInfoRepo); err != nil { | ||
|
|
||
| settings, err := utils.LoadTransferSettings() | ||
| if err != nil || settings == nil { |
There was a problem hiding this comment.
We should not return if settings is nil, we should continue. Settings file does not exist on a clean run, until it is created with the settings command.
So far we also didn't return here if an error occurred. Our approach was to log it and not stop the transfer due to an error in the settings. If we decide to change approach, we should change it in all relevant places.
In addition, only log the error if it is not nil, this currently logs the error also when both the settings and error is nil.
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.
Emhance the
transfer-settingcommand to allow modifying the log level while thetransfer-filescommand is running.Depends on jfrog/jfrog-client-go#828