diff options
| author | Maran <maran.hidskes@gmail.com> | 2014-05-23 16:29:17 +0800 |
|---|---|---|
| committer | Maran <maran.hidskes@gmail.com> | 2014-05-23 16:29:17 +0800 |
| commit | 36683f2e2957c262b17e71b15ecdb04d2feda0f5 (patch) | |
| tree | c385d96d4b92708ac26364864a28a0639d2c1f53 /ethereal | |
| parent | 6b115659ca3f5879f27c45723ef567b67133bc93 (diff) | |
| parent | 5f8911f7cba2cf837d891735f46b02b34e4fc228 (diff) | |
| download | go-tangerine-36683f2e2957c262b17e71b15ecdb04d2feda0f5.tar go-tangerine-36683f2e2957c262b17e71b15ecdb04d2feda0f5.tar.gz go-tangerine-36683f2e2957c262b17e71b15ecdb04d2feda0f5.tar.bz2 go-tangerine-36683f2e2957c262b17e71b15ecdb04d2feda0f5.tar.lz go-tangerine-36683f2e2957c262b17e71b15ecdb04d2feda0f5.tar.xz go-tangerine-36683f2e2957c262b17e71b15ecdb04d2feda0f5.tar.zst go-tangerine-36683f2e2957c262b17e71b15ecdb04d2feda0f5.zip | |
Merge branch 'develop' of github.com:ethereum/go-ethereum into develop
Diffstat (limited to 'ethereal')
| -rw-r--r-- | ethereal/config.go | 2 | ||||
| -rw-r--r-- | ethereal/ethereum.go | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/ethereal/config.go b/ethereal/config.go index 817befc2c..3864126db 100644 --- a/ethereal/config.go +++ b/ethereal/config.go @@ -4,6 +4,7 @@ import ( "flag" ) +var Identifier string var StartConsole bool var StartMining bool var StartRpc bool @@ -21,6 +22,7 @@ var DataDir string var AssetPath string func Init() { + flag.StringVar(&Identifier, "i", "", "Custom client identifier") flag.BoolVar(&StartConsole, "c", false, "debug and testing console") flag.BoolVar(&StartMining, "m", false, "start dagger mining") flag.BoolVar(&StartRpc, "r", false, "start rpc server") diff --git a/ethereal/ethereum.go b/ethereal/ethereum.go index 206971b41..30187d956 100644 --- a/ethereal/ethereum.go +++ b/ethereal/ethereum.go @@ -39,7 +39,7 @@ func main() { runtime.GOMAXPROCS(runtime.NumCPU()) ethchain.InitFees() - ethutil.ReadConfig(DataDir, ethutil.LogFile|ethutil.LogStd) + ethutil.ReadConfig(DataDir, ethutil.LogFile|ethutil.LogStd, Identifier) // Instantiated a eth stack ethereum, err := eth.New(eth.CapDefault, UseUPnP) |