diff options
| author | obscuren <geffobscura@gmail.com> | 2015-02-13 22:06:32 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2015-02-13 22:06:32 +0800 |
| commit | 75d164037fb9bbf75def7c5501727fd634ef124f (patch) | |
| tree | e5be5bd595139ff7dfbe6261e1e659d8e7dd6f9c /cmd/ethereum | |
| parent | 38faf2c51a1e4a86cda5dfa1b4f7fdae4fd7f58d (diff) | |
| parent | a5ea21cd85530eee6eb1bb83c37c20d009f11f74 (diff) | |
| download | dexon-75d164037fb9bbf75def7c5501727fd634ef124f.tar dexon-75d164037fb9bbf75def7c5501727fd634ef124f.tar.gz dexon-75d164037fb9bbf75def7c5501727fd634ef124f.tar.bz2 dexon-75d164037fb9bbf75def7c5501727fd634ef124f.tar.lz dexon-75d164037fb9bbf75def7c5501727fd634ef124f.tar.xz dexon-75d164037fb9bbf75def7c5501727fd634ef124f.tar.zst dexon-75d164037fb9bbf75def7c5501727fd634ef124f.zip | |
Merge branch 'logjson' into develop
Diffstat (limited to 'cmd/ethereum')
| -rw-r--r-- | cmd/ethereum/flags.go | 2 | ||||
| -rw-r--r-- | cmd/ethereum/main.go | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/cmd/ethereum/flags.go b/cmd/ethereum/flags.go index af57c6a67..bcdd7aa84 100644 --- a/cmd/ethereum/flags.go +++ b/cmd/ethereum/flags.go @@ -58,6 +58,7 @@ var ( ConfigFile string DebugFile string LogLevel int + LogFormat string Dump bool DumpHash string DumpNumber int @@ -112,6 +113,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(logger.InfoLevel), "loglevel: 0-5: silent,error,warn,info,debug,debug detail)") + flag.StringVar(&LogFormat, "logformat", "std", "logformat: std,raw)") flag.BoolVar(&DiffTool, "difftool", false, "creates output for diff'ing. Sets LogLevel=0") flag.StringVar(&DiffType, "diff", "all", "sets the level of diff output [vm, all]. Has no effect if difftool=false") flag.BoolVar(&ShowGenesis, "genesis", false, "Dump the genesis block") diff --git a/cmd/ethereum/main.go b/cmd/ethereum/main.go index 4b16fb79f..f8851ecd3 100644 --- a/cmd/ethereum/main.go +++ b/cmd/ethereum/main.go @@ -67,6 +67,7 @@ func main() { DataDir: Datadir, LogFile: LogFile, LogLevel: LogLevel, + LogFormat: LogFormat, Identifier: Identifier, MaxPeers: MaxPeer, Port: OutboundPort, |