From cbce882f5e35300016055cde81eeccb3ae052671 Mon Sep 17 00:00:00 2001
From: obscuren <geffobscura@gmail.com>
Date: Thu, 15 May 2014 20:45:19 +0200
Subject: Basic javascript console

---
 ethereum/ethereum.go | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'ethereum/ethereum.go')

diff --git a/ethereum/ethereum.go b/ethereum/ethereum.go
index 2abf6da42..8b42c2a2c 100644
--- a/ethereum/ethereum.go
+++ b/ethereum/ethereum.go
@@ -146,6 +146,13 @@ save these words so you can restore your account later: %s
 		console := NewConsole(ethereum)
 		go console.Start()
 	}
+
+	if StartExp {
+		c := NewJSConsole(ethereum)
+
+		go c.Start()
+	}
+
 	if StartRpc {
 		utils.DoRpc(ethereum, RpcPort)
 	}
-- 
cgit v1.2.3


From 0a03484188dc23707b343bb512ec341afc744a2e Mon Sep 17 00:00:00 2001
From: obscuren <geffobscura@gmail.com>
Date: Thu, 15 May 2014 22:15:14 +0200
Subject: Implemented JavaScript console

---
 ethereum/ethereum.go | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'ethereum/ethereum.go')

diff --git a/ethereum/ethereum.go b/ethereum/ethereum.go
index 8b42c2a2c..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,9 +150,7 @@ save these words so you can restore your account later: %s
 
 		console := NewConsole(ethereum)
 		go console.Start()
-	}
-
-	if StartExp {
+	} else if StartJsConsole {
 		c := NewJSConsole(ethereum)
 
 		go c.Start()
-- 
cgit v1.2.3