From 09841b1c9b2553a4572590128580df37c8fa83ad Mon Sep 17 00:00:00 2001
From: obscuren <geffobscura@gmail.com>
Date: Sun, 4 Jan 2015 14:20:16 +0100
Subject: Cleaned up some of that util

---
 logger/log.go | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)
 create mode 100644 logger/log.go

(limited to 'logger/log.go')

diff --git a/logger/log.go b/logger/log.go
new file mode 100644
index 000000000..53065f870
--- /dev/null
+++ b/logger/log.go
@@ -0,0 +1,33 @@
+package logger
+
+import (
+	"fmt"
+	"io"
+	"log"
+	"os"
+
+	"github.com/ethereum/go-ethereum/ethutil"
+)
+
+func openLogFile(datadir string, filename string) *os.File {
+	path := ethutil.AbsolutePath(datadir, filename)
+	file, err := os.OpenFile(path, os.O_RDWR|os.O_CREATE|os.O_APPEND, 0666)
+	if err != nil {
+		panic(fmt.Sprintf("error opening log file '%s': %v", filename, err))
+	}
+	return file
+}
+
+func New(datadir string, logFile string, logLevel int) LogSystem {
+	var writer io.Writer
+	if logFile == "" {
+		writer = os.Stdout
+	} else {
+		writer = openLogFile(datadir, logFile)
+	}
+
+	sys := NewStdLogSystem(writer, log.LstdFlags, LogLevel(logLevel))
+	AddLogSystem(sys)
+
+	return sys
+}
-- 
cgit v1.2.3


From bdf99e098126880c10dc2ef68623c47ec6f04537 Mon Sep 17 00:00:00 2001
From: Taylor Gerring <taylor.gerring@gmail.com>
Date: Wed, 21 Jan 2015 10:17:07 -0600
Subject: Add LogFormat flag

---
 logger/log.go | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'logger/log.go')

diff --git a/logger/log.go b/logger/log.go
index 53065f870..baa3dfaf2 100644
--- a/logger/log.go
+++ b/logger/log.go
@@ -18,7 +18,7 @@ func openLogFile(datadir string, filename string) *os.File {
 	return file
 }
 
-func New(datadir string, logFile string, logLevel int) LogSystem {
+func New(datadir string, logFile string, logLevel int, logFormat string) LogSystem {
 	var writer io.Writer
 	if logFile == "" {
 		writer = os.Stdout
@@ -26,7 +26,13 @@ func New(datadir string, logFile string, logLevel int) LogSystem {
 		writer = openLogFile(datadir, logFile)
 	}
 
-	sys := NewStdLogSystem(writer, log.LstdFlags, LogLevel(logLevel))
+	var sys LogSystem
+	switch logFormat {
+	case "raw":
+		sys = NewRawLogSystem(writer, 0, LogLevel(logLevel))
+	default:
+		sys = NewStdLogSystem(writer, log.LstdFlags, LogLevel(logLevel))
+	}
 	AddLogSystem(sys)
 
 	return sys
-- 
cgit v1.2.3