diff options
| author | obscuren <geffobscura@gmail.com> | 2015-04-01 18:51:39 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2015-04-01 18:51:39 +0800 |
| commit | b0e09ec82752b48c2384c315dc420e5c39e785b6 (patch) | |
| tree | 0dc20ee3807e3fe5a076fbfe2ec00bd6601792a6 /cmd/utils | |
| parent | 6afc5e762af0f81b70256ebb7e830b09caf17be0 (diff) | |
| parent | 720d978e356bba74160dbdd95b51bcb8087fb92e (diff) | |
| download | dexon-b0e09ec82752b48c2384c315dc420e5c39e785b6.tar dexon-b0e09ec82752b48c2384c315dc420e5c39e785b6.tar.gz dexon-b0e09ec82752b48c2384c315dc420e5c39e785b6.tar.bz2 dexon-b0e09ec82752b48c2384c315dc420e5c39e785b6.tar.lz dexon-b0e09ec82752b48c2384c315dc420e5c39e785b6.tar.xz dexon-b0e09ec82752b48c2384c315dc420e5c39e785b6.tar.zst dexon-b0e09ec82752b48c2384c315dc420e5c39e785b6.zip | |
merge conflict
Diffstat (limited to 'cmd/utils')
| -rw-r--r-- | cmd/utils/flags.go | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go index 2a3e2f447..e82fd9c28 100644 --- a/cmd/utils/flags.go +++ b/cmd/utils/flags.go @@ -2,9 +2,6 @@ package utils import ( "crypto/ecdsa" - "fmt" - "net" - "net/http" "os" "path" "runtime" @@ -148,7 +145,11 @@ var ( Usage: "Port on which the JSON-RPC server should listen", Value: 8545, } - + RPCCORSDomainFlag = cli.StringFlag{ + Name: "rpccorsdomain", + Usage: "Domain on which to send Access-Control-Allow-Origin header", + Value: "", + } // Network Settings MaxPeersFlag = cli.IntFlag{ Name: "maxpeers", @@ -255,12 +256,12 @@ func GetAccountManager(ctx *cli.Context) *accounts.Manager { } func StartRPC(eth *eth.Ethereum, ctx *cli.Context) { - addr := ctx.GlobalString(RPCListenAddrFlag.Name) - port := ctx.GlobalInt(RPCPortFlag.Name) - fmt.Println("Starting RPC on port: ", port) - l, err := net.Listen("tcp", fmt.Sprintf("%s:%d", addr, port)) - if err != nil { - Fatalf("Can't listen on %s:%d: %v", addr, port, err) + config := rpc.RpcConfig{ + ListenAddress: ctx.GlobalString(RPCListenAddrFlag.Name), + ListenPort: uint(ctx.GlobalInt(RPCPortFlag.Name)), + CorsDomain: ctx.GlobalString(RPCCORSDomainFlag.Name), } - go http.Serve(l, rpc.JSONRPC(xeth.New(eth, nil))) + + xeth := xeth.New(eth, nil) + _ = rpc.Start(xeth, config) } |