Merge branch 'feature/otto' into develop

1 files changed, 11 insertions, 1 deletions

diff --git a/ethereum/ethereum.go b/ethereum/ethereum.go
index 2abf6da42..128e11139 100644
--- a/ethereum/ethereum.go
+++ b/ethereum/ethereum.go
@@ -52,7 +52,12 @@ func main() {
 	var logSys *log.Logger
 	flags := log.LstdFlags
 
-	ethutil.ReadConfig(DataDir)
+	if StartJsConsole {
+		ethutil.ReadConfig(DataDir, ethutil.LogFile)
+	} else {
+		ethutil.ReadConfig(DataDir, ethutil.LogFile|ethutil.LogStd)
+	}
+
 	logger := ethutil.Config.Log
 
 	if LogFile != "" {
@@ -145,7 +150,12 @@ save these words so you can restore your account later: %s
 
 		console := NewConsole(ethereum)
 		go console.Start()
+	} else if StartJsConsole {
+		c := NewJSConsole(ethereum)
+
+		go c.Start()
 	}
+
 	if StartRpc {
 		utils.DoRpc(ethereum, RpcPort)
 	}