fix issue 2304: ux improvements #2317
There are no files selected for viewing
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
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
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
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
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
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
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -72,13 +72,25 @@ func flagForRepo(t repo.RepoType) string { | |
| case repo.FullNode: | ||
| return "repo" | ||
| case repo.StorageMiner: | ||
| return "miner-repo" | ||
| default: | ||
| panic(fmt.Sprintf("Unknown repo type: %v", t)) | ||
| } | ||
| } | ||
|
|
||
| func envForRepo(t repo.RepoType) string { | ||
| switch t { | ||
| case repo.FullNode: | ||
| return "FULLNODE_API_INFO" | ||
| case repo.StorageMiner: | ||
| return "MINER_API_INFO" | ||
|
There was a problem hiding this comment. To fully support deprecation we'd need to figure out how to handle this stuff as well. This only returns the used value (which is fine), but we would need to handle both in the @magik6k might have some ideas where, but an off the cuff solution would be to change both of these There was a problem hiding this comment. how about add There was a problem hiding this comment. Oh yes, that sound like a better idea |
||
| default: | ||
| panic(fmt.Sprintf("Unknown repo type: %v", t)) | ||
| } | ||
| } | ||
|
|
||
| // TODO remove after deprecation period | ||
| func envForRepoDeprecation(t repo.RepoType) string { | ||
| switch t { | ||
| case repo.FullNode: | ||
| return "FULLNODE_API_INFO" | ||
|
|
@@ -90,14 +102,24 @@ func envForRepo(t repo.RepoType) string { | |
| } | ||
|
|
||
| func GetAPIInfo(ctx *cli.Context, t repo.RepoType) (APIInfo, error) { | ||
| envKey := envForRepo(t) | ||
| env, ok := os.LookupEnv(envKey) | ||
| if !ok { | ||
| // TODO remove after deprecation period | ||
| envKey = envForRepoDeprecation(t) | ||
| env, ok = os.LookupEnv(envKey) | ||
| if ok { | ||
| log.Warnf("Use deprecation env(%s) value, please use env(%s) instead.", envKey, envForRepo(t)) | ||
| } | ||
| } | ||
| if ok { | ||
| sp := strings.SplitN(env, ":", 2) | ||
| if len(sp) != 2 { | ||
| log.Warnf("invalid env(%s) value, missing token or address", envKey) | ||
| } else { | ||
| ma, err := multiaddr.NewMultiaddr(sp[1]) | ||
| if err != nil { | ||
| return APIInfo{}, xerrors.Errorf("could not parse multiaddr from env(%s): %w", envKey, err) | ||
| } | ||
| return APIInfo{ | ||
| Addr: ma, | ||
|
|
||
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.
whats this for?
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.
for
EnvironmentFile=-/etc/lotus/chainwatch.envinlotus-chainwatch.service.