This repository has been archived by the owner on Dec 8, 2021. It is now read-only.
config: change redact log parameter name #547
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
lichunzhu
added
Should Update Docs
lichunzhu
changed the title
|
LGTM |
overvenus
reviewed
Jan 12, 2021
lightning/log/log.go
Outdated
| @@ -45,7 +45,7 @@ type Config struct { | |||
| // Maximum number of old log files to retain. | |||
| FileMaxBackups int `toml:"max-backups" json:"max-backups"` | |||
| // Redact sensitive logs during the whole process | |||
| RedactLog bool `toml:"redact-log" json:"redact-log"` | |||
| RedactLog bool `toml:"redact-info-log" json:"redact-info-log"` | |||
There was a problem hiding this comment.
We need to preserve compatibility for 5.0-rc
There was a problem hiding this comment.
5.0-rc doesn't have this feature
There was a problem hiding this comment.
if we want to be consistent with PD it should be placed inside the [security] section 🤔
There was a problem hiding this comment.
Sounds reasonable.
lightning/config/global.go
Outdated
| @@ -144,7 +144,7 @@ func LoadGlobalConfig(args []string, extraFlags func(*flag.FlagSet)) (*GlobalCon | |||
|
|
|||
| logLevel := flagext.ChoiceVar(fs, "L", "", `log level: info, debug, warn, error, fatal (default info)`, "", "info", "debug", "warn", "warning", "error", "fatal") | |||
| logFilePath := fs.String("log-file", "", "log file path") | |||
| redactLog := fs.Bool("redact-log", false, "whether to redact sensitive info in log") | |||
| redactLog := fs.Bool("redact-info-log", false, "whether to redact sensitive info in log") | |||
There was a problem hiding this comment.
We need to preserve compatibility for 5.0-rc
There was a problem hiding this comment.
shall we also cherry-pick this commit to release-5.0-rc?
There was a problem hiding this comment.
We should pick both this commit and #538 to 5.0-rc. But we can do it in next version.
There was a problem hiding this comment.
oh, we only need to cherry-pick this commit to release-4.0
|
LGTM |
ti-srebot
added
status/LGT2
ti-srebot
approved these changes
Jan 13, 2021
glorv
pushed a commit
that referenced
this pull request
Jan 13, 2021
* change redact log parameter name * address comment * update lightning.toml
This was referenced Jan 13, 2021
glorv
added a commit
that referenced
this pull request
Jan 13, 2021
glorv
pushed a commit
that referenced
this pull request
Jan 29, 2021
* change redact log parameter name * address comment * update lightning.toml
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
What problem does this PR solve?
In #538, we added the
redact-logparameter.The redact log parameter name is different from TiKV's and PD's.
https://github.com/tikv/tikv/blob/master/etc/config-template.toml#L846
In TiKV it's
redact-info-logconfiguration in config file.https://github.com/tikv/pd/blob/master/server/config/config.go#L1373
In PD it's
redact-info-logconfiguration in config file.What is changed and how it works?
Change
redact-logtoredact-info-log.Check List
Tests
Side effects
Related changes