This repository has been archived by the owner on Sep 26, 2019. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 130
[NC-2118] Method to reload permissions file #834
Merged
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
mark-terry
reviewed
Feb 12, 2019
...theon/ethereum/jsonrpc/internal/methods/permissioning/PermReloadPermissionsFromFileTest.java
Outdated
Show resolved
Hide resolved
.../src/main/java/tech/pegasys/pantheon/ethereum/p2p/permissioning/NodeWhitelistController.java
Outdated
Show resolved
Hide resolved
configuration.isAccountWhitelistEnabled()); | ||
|
||
readNodesFromConfig(updatedConfig); | ||
this.configuration = updatedConfig; |
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.
It's probably an unlikely case, but should the config be reverted if the Exception is thrown?
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.
We only update the config as the last line inside the try-catch block. Any exception thrown before that will result in the configuration object not being updated.
"Error reloading permissions file. In-memory whitelisted accounts will be reverted to previous valid configuration. " | ||
+ "Details: {}", | ||
e.getMessage()); | ||
this.accountWhitelist.addAll(currentAccountsList); |
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.
See NodeWhitelistController comments.
mark-terry
approved these changes
Feb 12, 2019
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.
PR description
Implemented perm_reloadPermissionsFile API method that will trigger a reload of the permissions file, updating the accounts and nodes whitelists.