diff options
| author | obscuren <geffobscura@gmail.com> | 2015-03-23 04:43:36 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2015-03-23 04:43:36 +0800 |
| commit | 8b1b9fc99d63a19c216edebc07096718e835937d (patch) | |
| tree | 8a04499cb63dd8d91fd136f65c29605844c5bae8 /cmd | |
| parent | 8ed4f226d1dbecc9625a2f142e22926569198b73 (diff) | |
| parent | 0edb33566fbe20863c884e553e214ed9b78b0f23 (diff) | |
| download | go-tangerine-8b1b9fc99d63a19c216edebc07096718e835937d.tar.gz go-tangerine-8b1b9fc99d63a19c216edebc07096718e835937d.tar.zst go-tangerine-8b1b9fc99d63a19c216edebc07096718e835937d.zip | |
Merge branch 'jsonlog' of https://github.com/ethersphere/go-ethereum into ethersphere-jsonlog
Conflicts:
eth/backend.go
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/ethereum/main.go | 2 | ||||
| -rw-r--r-- | cmd/utils/flags.go | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/cmd/ethereum/main.go b/cmd/ethereum/main.go index b9a4ff045..e351453b1 100644 --- a/cmd/ethereum/main.go +++ b/cmd/ethereum/main.go @@ -135,7 +135,7 @@ The Ethereum JavaScript VM exposes a node admin interface as well as the DAPP Ja utils.JSpathFlag, utils.ListenPortFlag, utils.LogFileFlag, - utils.LogFormatFlag, + utils.LogJSONFlag, utils.LogLevelFlag, utils.MaxPeersFlag, utils.MinerThreadsFlag, diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go index 1d8f6382b..f87d25ce9 100644 --- a/cmd/utils/flags.go +++ b/cmd/utils/flags.go @@ -117,10 +117,10 @@ var ( Usage: "0-5 (silent, error, warn, info, debug, debug detail)", Value: int(logger.InfoLevel), } - LogFormatFlag = cli.StringFlag{ - Name: "logformat", - Usage: `"std" or "raw"`, - Value: "std", + LogJSONFlag = cli.StringFlag{ + Name: "logjson", + Usage: "Send json structured log output to a file or '-' for standard output (default: no json output)", + Value: "", } VMDebugFlag = cli.BoolFlag{ Name: "vmdebug", @@ -213,7 +213,7 @@ func MakeEthConfig(clientID, version string, ctx *cli.Context) *eth.Config { NetworkId: ctx.GlobalInt(NetworkIdFlag.Name), LogFile: ctx.GlobalString(LogFileFlag.Name), LogLevel: ctx.GlobalInt(LogLevelFlag.Name), - LogFormat: ctx.GlobalString(LogFormatFlag.Name), + LogJSON: ctx.GlobalString(LogJSONFlag.Name), MinerThreads: ctx.GlobalInt(MinerThreadsFlag.Name), AccountManager: GetAccountManager(ctx), VmDebug: ctx.GlobalBool(VMDebugFlag.Name), |