Re-enable node permissioning.

Also:

* update usage info options
* update relevant logging
This commit is contained in:
Joel Burget 2017-11-06 10:34:29 -05:00
parent f76983cdab
commit 81f0c9294e
3 changed files with 4 additions and 5 deletions

View File

@ -114,6 +114,7 @@ var (
utils.GpoPercentileFlag,
utils.ExtraDataFlag,
configFileFlag,
utils.EnableNodePermissionFlag,
utils.RaftModeFlag,
utils.RaftBlockTimeFlag,
utils.RaftJoinExistingFlag,

View File

@ -116,11 +116,9 @@ var AppHelpFlagGroups = []flagGroup{
},
},
{
Name: "RAFT",
Name: "QUORUM",
Flags: []cli.Flag{
utils.RaftModeFlag,
utils.RaftBlockTimeFlag,
utils.RaftJoinExistingFlag,
utils.EnableNodePermissionFlag,
},
},
{

View File

@ -739,7 +739,7 @@ func (srv *Server) SetupConn(fd net.Conn, flags connFlag, dialDest *discover.Nod
if dialDest != nil {
node = dialDest.ID.String()
direction = "OUTGOING"
log.Info("Connection Direction <%v>", direction)
log.Trace("Node Permissioning", "Connection Direction", direction)
}
if !isNodePermissioned(node, currentNode, srv.DataDir, direction) {