roysc/plugeth
1
0
Fork 0
forked from cerc-io/plugeth
Code Pull Requests Activity

cmd/geth, cmd/mist: use gitCommit in node name

Browse Source
This commit is contained in:
Felix Lange 2015-04-28 13:14:53 +02:00
parent 71c28cfb0c
commit eb5e43022e
2 changed files with 36 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
cmd/geth/main.go
View File

@ -50,9 +50,20 @@ const (
Version = "0.9.12" Version = "0.9.12"
) )
var app = utils.NewApp(Version, "the go-ethereum command line interface") var (
gitCommit string // set via linker flag
nodeNameVersion string
app *cli.App
)
func init() { func init() {
if gitCommit == "" {
nodeNameVersion = Version
} else {
nodeNameVersion = Version + "-" + gitCommit[:8]
}
app = utils.NewApp(Version, "the go-ethereum command line interface")
app.Action = run app.Action = run
app.HideVersion = true // we have a command to print the version app.HideVersion = true // we have a command to print the version
app.Commands = []cli.Command{ app.Commands = []cli.Command{
@ -278,7 +289,7 @@ func main() {
func run(ctx *cli.Context) { func run(ctx *cli.Context) {
utils.HandleInterrupt() utils.HandleInterrupt()
cfg := utils.MakeEthConfig(ClientIdentifier, Version, ctx) cfg := utils.MakeEthConfig(ClientIdentifier, nodeNameVersion, ctx)
ethereum, err := eth.New(cfg) ethereum, err := eth.New(cfg)
if err != nil { if err != nil {
utils.Fatalf("%v", err) utils.Fatalf("%v", err)
@ -290,7 +301,7 @@ func run(ctx *cli.Context) {
} }
func console(ctx *cli.Context) { func console(ctx *cli.Context) {
cfg := utils.MakeEthConfig(ClientIdentifier, Version, ctx) cfg := utils.MakeEthConfig(ClientIdentifier, nodeNameVersion, ctx)
ethereum, err := eth.New(cfg) ethereum, err := eth.New(cfg)
if err != nil { if err != nil {
utils.Fatalf("%v", err) utils.Fatalf("%v", err)
@ -305,7 +316,7 @@ func console(ctx *cli.Context) {
} }
func execJSFiles(ctx *cli.Context) { func execJSFiles(ctx *cli.Context) {
cfg := utils.MakeEthConfig(ClientIdentifier, Version, ctx) cfg := utils.MakeEthConfig(ClientIdentifier, nodeNameVersion, ctx)
ethereum, err := eth.New(cfg) ethereum, err := eth.New(cfg)
if err != nil { if err != nil {
utils.Fatalf("%v", err) utils.Fatalf("%v", err)
@ -487,7 +498,7 @@ func exportchain(ctx *cli.Context) {
utils.Fatalf("This command requires an argument.") utils.Fatalf("This command requires an argument.")
} }
cfg := utils.MakeEthConfig(ClientIdentifier, Version, ctx) cfg := utils.MakeEthConfig(ClientIdentifier, nodeNameVersion, ctx)
cfg.SkipBcVersionCheck = true cfg.SkipBcVersionCheck = true
ethereum, err := eth.New(cfg) ethereum, err := eth.New(cfg)
@ -589,15 +600,17 @@ func makedag(ctx *cli.Context) {
} }
func version(c *cli.Context) { func version(c *cli.Context) {
fmt.Printf(`%v fmt.Println(ClientIdentifier)
Version: %v fmt.Println("Version:", Version)
Protocol Version: %d if gitCommit != "" {
Network Id: %d fmt.Println("Git Commit:", gitCommit)
GO: %s }
OS: %s fmt.Println("Protocol Version:", c.GlobalInt(utils.ProtocolVersionFlag.Name))
GOPATH=%s fmt.Println("Network Id:", c.GlobalInt(utils.NetworkIdFlag.Name))
GOROOT=%s fmt.Println("Go Version:", runtime.Version())
`, ClientIdentifier, Version, c.GlobalInt(utils.ProtocolVersionFlag.Name), c.GlobalInt(utils.NetworkIdFlag.Name), runtime.Version(), runtime.GOOS, os.Getenv("GOPATH"), runtime.GOROOT()) fmt.Println("OS:", runtime.GOOS)
fmt.Printf("GOPATH=%s\n", os.Getenv("GOPATH"))
fmt.Printf("GOROOT=%s\n", runtime.GOROOT())
} }
// hashish returns true for strings that look like hashes. // hashish returns true for strings that look like hashes.

10
cmd/mist/main.go
View File

@ -41,6 +41,9 @@ const (
) )
var ( var (
gitCommit string // set via linker flag
nodeNameVersion string
app = utils.NewApp(Version, "the ether browser") app = utils.NewApp(Version, "the ether browser")
assetPathFlag = cli.StringFlag{ assetPathFlag = cli.StringFlag{
Name: "asset_path", Name: "asset_path",
@ -55,6 +58,11 @@ func init() {
if len(rpcCorsFlag.Value) == 0 { if len(rpcCorsFlag.Value) == 0 {
rpcCorsFlag.Value = "http://localhost" rpcCorsFlag.Value = "http://localhost"
} }
if gitCommit == "" {
nodeNameVersion = Version
} else {
nodeNameVersion = Version + "-" + gitCommit[:8]
}
app.Action = run app.Action = run
app.Flags = []cli.Flag{ app.Flags = []cli.Flag{
@ -107,7 +115,7 @@ func run(ctx *cli.Context) {
tstart := time.Now() tstart := time.Now()
// TODO: show qml popup instead of exiting if initialization fails. // TODO: show qml popup instead of exiting if initialization fails.
cfg := utils.MakeEthConfig(ClientIdentifier, Version, ctx) cfg := utils.MakeEthConfig(ClientIdentifier, nodeNameVersion, ctx)
ethereum, err := eth.New(cfg) ethereum, err := eth.New(cfg)
if err != nil { if err != nil {
utils.Fatalf("%v", err) utils.Fatalf("%v", err)