diff options
| author | Javier Peletier <jm@epiclabs.io> | 2018-03-05 23:00:03 +0800 |
|---|---|---|
| committer | Javier Peletier <jm@epiclabs.io> | 2018-03-05 23:00:03 +0800 |
| commit | 13b566e06e9aae28bddde431c7d53a335272411a (patch) | |
| tree | b649ab64ca2c00327500aed5c826d5a6f454a6cf /cmd/utils | |
| parent | 1e72271f571f916691c5c18b8f0c4c5f7e0445c3 (diff) | |
| parent | 1548518644071c8fa8eb98a8cb8a8c4603400acb (diff) | |
| download | dexon-13b566e06e9aae28bddde431c7d53a335272411a.tar dexon-13b566e06e9aae28bddde431c7d53a335272411a.tar.gz dexon-13b566e06e9aae28bddde431c7d53a335272411a.tar.bz2 dexon-13b566e06e9aae28bddde431c7d53a335272411a.tar.lz dexon-13b566e06e9aae28bddde431c7d53a335272411a.tar.xz dexon-13b566e06e9aae28bddde431c7d53a335272411a.tar.zst dexon-13b566e06e9aae28bddde431c7d53a335272411a.zip | |
accounts/abi: Add one-parameter event test case from enriquefynn/unpack_one_arg_event
Diffstat (limited to 'cmd/utils')
| -rw-r--r-- | cmd/utils/cmd.go | 5 | ||||
| -rw-r--r-- | cmd/utils/flags.go | 7 |
2 files changed, 7 insertions, 5 deletions
diff --git a/cmd/utils/cmd.go b/cmd/utils/cmd.go index 53cdf7861..186d18d8f 100644 --- a/cmd/utils/cmd.go +++ b/cmd/utils/cmd.go @@ -25,6 +25,7 @@ import ( "os/signal" "runtime" "strings" + "syscall" "github.com/ethereum/go-ethereum/core" "github.com/ethereum/go-ethereum/core/types" @@ -64,7 +65,7 @@ func StartNode(stack *node.Node) { } go func() { sigc := make(chan os.Signal, 1) - signal.Notify(sigc, os.Interrupt) + signal.Notify(sigc, syscall.SIGINT, syscall.SIGTERM) defer signal.Stop(sigc) <-sigc log.Info("Got interrupt, shutting down...") @@ -85,7 +86,7 @@ func ImportChain(chain *core.BlockChain, fn string) error { // If a signal is received, the import will stop at the next batch. interrupt := make(chan os.Signal, 1) stop := make(chan struct{}) - signal.Notify(interrupt, os.Interrupt) + signal.Notify(interrupt, syscall.SIGINT, syscall.SIGTERM) defer signal.Stop(interrupt) defer close(interrupt) go func() { diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go index 5fd5013f0..dbf26b8e0 100644 --- a/cmd/utils/flags.go +++ b/cmd/utils/flags.go @@ -400,7 +400,7 @@ var ( RPCVirtualHostsFlag = cli.StringFlag{ Name: "rpcvhosts", Usage: "Comma separated list of virtual hostnames from which to accept requests (server enforced). Accepts '*' wildcard.", - Value: "localhost", + Value: strings.Join(node.DefaultConfig.HTTPVirtualHosts, ","), } RPCApiFlag = cli.StringFlag{ Name: "rpcapi", @@ -695,8 +695,9 @@ func setHTTP(ctx *cli.Context, cfg *node.Config) { if ctx.GlobalIsSet(RPCApiFlag.Name) { cfg.HTTPModules = splitAndTrim(ctx.GlobalString(RPCApiFlag.Name)) } - - cfg.HTTPVirtualHosts = splitAndTrim(ctx.GlobalString(RPCVirtualHostsFlag.Name)) + if ctx.GlobalIsSet(RPCVirtualHostsFlag.Name) { + cfg.HTTPVirtualHosts = splitAndTrim(ctx.GlobalString(RPCVirtualHostsFlag.Name)) + } } // setWS creates the WebSocket RPC listener interface string from the set |