Merge pull request ethereum#261 from jimthematrix/permissioned-nodes

patrickmn · web-flow · commit f27f7b3ad322 · 2018-01-25T13:06:50.000-05:00
Fixed missing DataDir value in p2p server that affected permissioned nodes
diff --git a/node/node.go b/node/node.go
@@ -156,6 +156,7 @@ func (n *Node) Start() error {
 		n.serverConfig.NodeDatabase = n.config.NodeDB()
 	}
 	n.serverConfig.EnableNodePermission = n.config.EnableNodePermission
+	n.serverConfig.DataDir = n.config.DataDir
 	running := &p2p.Server{Config: n.serverConfig}
 	log.Info("Starting peer-to-peer node", "instance", n.serverConfig.Name)
 

Original file line number	Diff line number	Diff line change
`@@ -156,6 +156,7 @@ func (n *Node) Start() error {`
`156`	`156`	`n.serverConfig.NodeDatabase = n.config.NodeDB()`
`157`	`157`	`}`
`158`	`158`	`n.serverConfig.EnableNodePermission = n.config.EnableNodePermission`
	`159`	`+ n.serverConfig.DataDir = n.config.DataDir`
`159`	`160`	`running := &p2p.Server{Config: n.serverConfig}`
`160`	`161`	`log.Info("Starting peer-to-peer node", "instance", n.serverConfig.Name)`
`161`	`162`