From 1024766514eea7bb628ec6e5ed974e997b8faefc Mon Sep 17 00:00:00 2001 From: zelig Date: Mon, 23 Jun 2014 12:20:59 +0100 Subject: refactor cli and gui wrapper code. Details: - all cli functions shared between ethereum and ethereal abstracted to utils/ cmd.go (should be ethcommon or shared or sth) - simplify main() now readable stepwise - rename main wrapper files to main.go - rename commmand line args definition file from config.go to flags.go - rename Do -> Start to parallel option names - register interrupt for rpc server stop - fix interrupt stopping js repl and ethereum - register interrupt for mining stop - custom config file option from command line - debug option from command line - loglevel option from command line - changed ethutil.Config API - default datadir and default config file set together with other flag defaults in wrappers - default assetpath set together with other command line flags defaults in gui wrapper (not in ethutil.Config or ui/ui_lib) - options precedence: default < config file < environment variables < command line --- ethereal/flags.go | 81 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 81 insertions(+) create mode 100644 ethereal/flags.go (limited to 'ethereal/flags.go') diff --git a/ethereal/flags.go b/ethereal/flags.go new file mode 100644 index 000000000..18f55071a --- /dev/null +++ b/ethereal/flags.go @@ -0,0 +1,81 @@ +package main + +import ( + "flag" +) + +var Identifier string +var StartRpc bool +var RpcPort int +var UseUPnP bool +var OutboundPort string +var ShowGenesis bool +var AddPeer string +var MaxPeer int +var GenAddr bool +var UseSeed bool +var ImportKey string +var ExportKey bool +var NonInteractive bool +var Datadir string +var LogFile string +var ConfigFile string +var DebugFile string +var LogLevel int + +// flags specific to gui client +var AssetPath string + +func defaultAssetPath() string { + var assetPath string + // If the current working directory is the go-ethereum dir + // assume a debug build and use the source directory as + // asset directory. + pwd, _ := os.Getwd() + if pwd == path.Join(os.Getenv("GOPATH"), "src", "github.com", "ethereum", "go-ethereum", "ethereal") { + assetPath = path.Join(pwd, "assets") + } else { + switch runtime.GOOS { + case "darwin": + // Get Binary Directory + exedir, _ := osext.ExecutableFolder() + assetPath = filepath.Join(exedir, "../Resources") + case "linux": + assetPath = "/usr/share/ethereal" + case "window": + fallthrough + default: + assetPath = "." + } + } + return assetPath +} + +func defaultDataDir() string { + usr, _ := user.Current() + return path.Join(usr.HomeDir, ".ethereum") +} + +var defaultConfigFile = path.Join(defaultDataDir(), "conf.ini") + +func Init() { + flag.StringVar(&Identifier, "id", "", "Custom client identifier") + flag.StringVar(&OutboundPort, "port", "30303", "listening port") + flag.BoolVar(&UseUPnP, "upnp", false, "enable UPnP support") + flag.IntVar(&MaxPeer, "maxpeer", 10, "maximum desired peers") + flag.IntVar(&RpcPort, "rpcport", 8080, "port to start json-rpc server on") + flag.BoolVar(&StartRpc, "rpc", false, "start rpc server") + flag.BoolVar(&NonInteractive, "y", false, "non-interactive mode (say yes to confirmations)") + flag.BoolVar(&UseSeed, "seed", true, "seed peers") + flag.BoolVar(&GenAddr, "genaddr", false, "create a new priv/pub key") + flag.BoolVar(&ExportKey, "export", false, "export private key") + flag.StringVar(&LogFile, "logfile", "", "log file (defaults to standard output)") + flag.StringVar(&ImportKey, "import", "", "imports the given private key (hex)") + flag.StringVar(&Datadir, "datadir", defaultDataDir(), "specifies the datadir to use") + flag.StringVar(&ConfigFile, "conf", defaultConfigFile, "config file") + flag.StringVar(&DebugFile, "debug", "", "debug file (no debugging if not set)") + flag.IntVar(&LogLevel, "loglevel", int(ethlog.InfoLevel), "loglevel: 0-4: silent,error,warn,info,debug)") + flag.StringVar(&AssetPath, "asset_path", defaultAssetPath, "absolute path to GUI assets directory") + + flag.Parse() +} -- cgit v1.2.3 From 6f09a3e8200ba2eeeeb296141d6644d04078a9c4 Mon Sep 17 00:00:00 2001 From: zelig Date: Mon, 23 Jun 2014 12:38:23 +0100 Subject: fix imports in ui_lib and flags cos of defaultAssetPath move; fix logLevel type for gui --- ethereal/flags.go | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) (limited to 'ethereal/flags.go') diff --git a/ethereal/flags.go b/ethereal/flags.go index 18f55071a..5975439c9 100644 --- a/ethereal/flags.go +++ b/ethereal/flags.go @@ -1,7 +1,15 @@ package main import ( + "fmt" + "os" + "os/user" + "path" + "github.com/ethereum/eth-go/ethlog" "flag" + "bitbucket.org/kardianos/osext" + "path/filepath" + "runtime" ) var Identifier string @@ -59,6 +67,11 @@ func defaultDataDir() string { var defaultConfigFile = path.Join(defaultDataDir(), "conf.ini") func Init() { + flag.Usage = func() { + fmt.Fprintf(os.Stderr, "%s [options] [filename]:\noptions precedence: default < config file < environment variables < command line", os.Args[0]) + flag.PrintDefaults() + } + flag.StringVar(&Identifier, "id", "", "Custom client identifier") flag.StringVar(&OutboundPort, "port", "30303", "listening port") flag.BoolVar(&UseUPnP, "upnp", false, "enable UPnP support") @@ -75,7 +88,7 @@ func Init() { flag.StringVar(&ConfigFile, "conf", defaultConfigFile, "config file") flag.StringVar(&DebugFile, "debug", "", "debug file (no debugging if not set)") flag.IntVar(&LogLevel, "loglevel", int(ethlog.InfoLevel), "loglevel: 0-4: silent,error,warn,info,debug)") - flag.StringVar(&AssetPath, "asset_path", defaultAssetPath, "absolute path to GUI assets directory") + flag.StringVar(&AssetPath, "asset_path", defaultAssetPath(), "absolute path to GUI assets directory") flag.Parse() } -- cgit v1.2.3 From 8ee1abecb971e39ad5e0ed5b199ff4bf553ca67a Mon Sep 17 00:00:00 2001 From: zelig Date: Wed, 25 Jun 2014 16:54:29 +0100 Subject: update log levels to include DebugDetail; correct default datadir for ethereal --- ethereal/flags.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'ethereal/flags.go') diff --git a/ethereal/flags.go b/ethereal/flags.go index 5975439c9..5ab4c80e2 100644 --- a/ethereal/flags.go +++ b/ethereal/flags.go @@ -61,7 +61,7 @@ func defaultAssetPath() string { func defaultDataDir() string { usr, _ := user.Current() - return path.Join(usr.HomeDir, ".ethereum") + return path.Join(usr.HomeDir, ".ethereal") } var defaultConfigFile = path.Join(defaultDataDir(), "conf.ini") @@ -87,7 +87,8 @@ func Init() { flag.StringVar(&Datadir, "datadir", defaultDataDir(), "specifies the datadir to use") flag.StringVar(&ConfigFile, "conf", defaultConfigFile, "config file") flag.StringVar(&DebugFile, "debug", "", "debug file (no debugging if not set)") - flag.IntVar(&LogLevel, "loglevel", int(ethlog.InfoLevel), "loglevel: 0-4: silent,error,warn,info,debug)") + flag.IntVar(&LogLevel, "loglevel", int(ethlog.InfoLevel), "loglevel: 0-5: silent,error,warn,info,debug,debug detail)") + flag.StringVar(&AssetPath, "asset_path", defaultAssetPath(), "absolute path to GUI assets directory") flag.Parse() -- cgit v1.2.3 From bf57e9603b9ef2c96e8e6d7c3d22ea674392d56b Mon Sep 17 00:00:00 2001 From: zelig Date: Wed, 25 Jun 2014 18:09:42 +0100 Subject: add newline to help usage msg --- ethereal/flags.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ethereal/flags.go') diff --git a/ethereal/flags.go b/ethereal/flags.go index 5ab4c80e2..7e83e355f 100644 --- a/ethereal/flags.go +++ b/ethereal/flags.go @@ -68,7 +68,7 @@ var defaultConfigFile = path.Join(defaultDataDir(), "conf.ini") func Init() { flag.Usage = func() { - fmt.Fprintf(os.Stderr, "%s [options] [filename]:\noptions precedence: default < config file < environment variables < command line", os.Args[0]) + fmt.Fprintf(os.Stderr, "%s [options] [filename]:\noptions precedence: default < config file < environment variables < command line\n", os.Args[0]) flag.PrintDefaults() } -- cgit v1.2.3 From ae5ace16190d48bfe7a0364fdb0b51644518ec42 Mon Sep 17 00:00:00 2001 From: zelig Date: Thu, 26 Jun 2014 18:41:36 +0100 Subject: go fmt --- ethereal/flags.go | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'ethereal/flags.go') diff --git a/ethereal/flags.go b/ethereal/flags.go index 7e83e355f..9bed38d9f 100644 --- a/ethereal/flags.go +++ b/ethereal/flags.go @@ -1,13 +1,13 @@ package main import ( + "bitbucket.org/kardianos/osext" + "flag" "fmt" + "github.com/ethereum/eth-go/ethlog" "os" - "os/user" - "path" - "github.com/ethereum/eth-go/ethlog" - "flag" - "bitbucket.org/kardianos/osext" + "os/user" + "path" "path/filepath" "runtime" ) @@ -60,8 +60,8 @@ func defaultAssetPath() string { } func defaultDataDir() string { - usr, _ := user.Current() - return path.Join(usr.HomeDir, ".ethereal") + usr, _ := user.Current() + return path.Join(usr.HomeDir, ".ethereal") } var defaultConfigFile = path.Join(defaultDataDir(), "conf.ini") -- cgit v1.2.3