aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--cmd/geth/main.go14
m---------cmd/mist/assets/ext/ethereum.js0
2 files changed, 6 insertions, 8 deletions
diff --git a/cmd/geth/main.go b/cmd/geth/main.go
index a3fe84bb8..9437f8eb4 100644
--- a/cmd/geth/main.go
+++ b/cmd/geth/main.go
@@ -46,10 +46,7 @@ const (
Version = "0.9.7"
)
-var (
- clilogger = logger.NewLogger("CLI")
- app = utils.NewApp(Version, "the go-ethereum command line interface")
-)
+var app = utils.NewApp(Version, "the go-ethereum command line interface")
func init() {
app.Action = run
@@ -217,9 +214,6 @@ JavaScript API. See https://github.com/ethereum/go-ethereum/wiki/Javascipt-Conso
utils.DataDirFlag,
utils.JSpathFlag,
utils.ListenPortFlag,
- utils.LogFileFlag,
- utils.LogJSONFlag,
- utils.LogLevelFlag,
utils.MaxPeersFlag,
utils.EtherbaseFlag,
utils.MinerThreadsFlag,
@@ -234,8 +228,12 @@ JavaScript API. See https://github.com/ethereum/go-ethereum/wiki/Javascipt-Conso
utils.ProtocolVersionFlag,
utils.NetworkIdFlag,
utils.RPCCORSDomainFlag,
+ utils.LogLevelFlag,
utils.BacktraceAtFlag,
utils.LogToStdErrFlag,
+ utils.LogVModuleFlag,
+ utils.LogFileFlag,
+ utils.LogJSONFlag,
}
// missing:
@@ -250,6 +248,7 @@ JavaScript API. See https://github.com/ethereum/go-ethereum/wiki/Javascipt-Conso
}
func main() {
+ fmt.Printf("Welcome to the FRONTIER\n")
runtime.GOMAXPROCS(runtime.NumCPU())
defer logger.Flush()
if err := app.Run(os.Args); err != nil {
@@ -259,7 +258,6 @@ func main() {
}
func run(ctx *cli.Context) {
- fmt.Printf("Welcome to the FRONTIER\n")
utils.HandleInterrupt()
cfg := utils.MakeEthConfig(ClientIdentifier, Version, ctx)
ethereum, err := eth.New(cfg)
diff --git a/cmd/mist/assets/ext/ethereum.js b/cmd/mist/assets/ext/ethereum.js
-Subproject 31e046dbecea51d3b99b21f3e7e60ddfb6c3930
+Subproject c80ede50c3b60a482f1ec76038325ec52f5e73b