updated logging

pull/671/head
obscuren 10 years ago
parent 688d118c7e
commit 50aa1f178c
  1. 14
      cmd/geth/main.go
  2. 2
      cmd/mist/assets/ext/ethereum.js

@ -46,10 +46,7 @@ const (
Version = "0.9.7" Version = "0.9.7"
) )
var ( var app = utils.NewApp(Version, "the go-ethereum command line interface")
clilogger = logger.NewLogger("CLI")
app = utils.NewApp(Version, "the go-ethereum command line interface")
)
func init() { func init() {
app.Action = run app.Action = run
@ -217,9 +214,6 @@ JavaScript API. See https://github.com/ethereum/go-ethereum/wiki/Javascipt-Conso
utils.DataDirFlag, utils.DataDirFlag,
utils.JSpathFlag, utils.JSpathFlag,
utils.ListenPortFlag, utils.ListenPortFlag,
utils.LogFileFlag,
utils.LogJSONFlag,
utils.LogLevelFlag,
utils.MaxPeersFlag, utils.MaxPeersFlag,
utils.EtherbaseFlag, utils.EtherbaseFlag,
utils.MinerThreadsFlag, utils.MinerThreadsFlag,
@ -234,8 +228,12 @@ JavaScript API. See https://github.com/ethereum/go-ethereum/wiki/Javascipt-Conso
utils.ProtocolVersionFlag, utils.ProtocolVersionFlag,
utils.NetworkIdFlag, utils.NetworkIdFlag,
utils.RPCCORSDomainFlag, utils.RPCCORSDomainFlag,
utils.LogLevelFlag,
utils.BacktraceAtFlag, utils.BacktraceAtFlag,
utils.LogToStdErrFlag, utils.LogToStdErrFlag,
utils.LogVModuleFlag,
utils.LogFileFlag,
utils.LogJSONFlag,
} }
// missing: // missing:
@ -250,6 +248,7 @@ JavaScript API. See https://github.com/ethereum/go-ethereum/wiki/Javascipt-Conso
} }
func main() { func main() {
fmt.Printf("Welcome to the FRONTIER\n")
runtime.GOMAXPROCS(runtime.NumCPU()) runtime.GOMAXPROCS(runtime.NumCPU())
defer logger.Flush() defer logger.Flush()
if err := app.Run(os.Args); err != nil { if err := app.Run(os.Args); err != nil {
@ -259,7 +258,6 @@ func main() {
} }
func run(ctx *cli.Context) { func run(ctx *cli.Context) {
fmt.Printf("Welcome to the FRONTIER\n")
utils.HandleInterrupt() utils.HandleInterrupt()
cfg := utils.MakeEthConfig(ClientIdentifier, Version, ctx) cfg := utils.MakeEthConfig(ClientIdentifier, Version, ctx)
ethereum, err := eth.New(cfg) ethereum, err := eth.New(cfg)

@ -1 +1 @@
Subproject commit 31e046dbecea51d3b99b21f3e7e60ddfb6c39304 Subproject commit c80ede50c3b60a482f1ec76038325ec52f5e73b0
Loading…
Cancel
Save