Switch from log15 to Go log

Author: MichaelS11

engine.go

@@ -16,7 +16,7 @@ func NewEngine() {
 }
 
 func (engine *Engine) Run() {
-	logger.Info("Engine Run start")
+	logger.Println("Engine Run start")
 
 	var event *termbox.Event
 
@@ -53,11 +53,11 @@ loop:
 		}
 	}
 
-	logger.Info("Engine Run end")
+	logger.Println("Engine Run end")
 }
 
 func (engine *Engine) Stop() {
-	logger.Info("Engine Stop start")
+	logger.Println("Engine Stop start")
 
 	if !engine.stopped {
 		engine.stopped = true
@@ -66,7 +66,7 @@ func (engine *Engine) Stop() {
 	engine.timer.Stop()
 	engine.aiTimer.Stop()
 
-	logger.Info("Engine Stop end")
+	logger.Println("Engine Stop end")
 }
 
 func (engine *Engine) Pause() {
@@ -98,7 +98,7 @@ func (engine *Engine) PreviewBoard() {
 }
 
 func (engine *Engine) NewGame() {
-	logger.Info("Engine NewGame start")
+	logger.Println("Engine NewGame start")
 
 	board.Clear()
 	engine.tickTime = 480 * time.Millisecond
@@ -122,7 +122,7 @@ loop:
 	}
 	engine.UnPause()
 
-	logger.Info("Engine NewGame end")
+	logger.Println("Engine NewGame end")
 }
 
 func (engine *Engine) ResetTimer(duration time.Duration) {
@@ -206,7 +206,7 @@ func (engine *Engine) LevelUp() {
 }
 
 func (engine *Engine) GameOver() {
-	logger.Info("Engine GameOver start")
+	logger.Println("Engine GameOver start")
 
 	engine.Pause()
 	engine.gameOver = true
@@ -225,7 +225,7 @@ loop:
 	engine.ranking.InsertScore(uint64(engine.score))
 	engine.ranking.Save()
 
-	logger.Info("Engine GameOver end")
+	logger.Println("Engine GameOver end")
 }
 
 func (engine *Engine) EnabledAi() {

globals.go

@@ -1,10 +1,10 @@
 package main
 
 import (
+	"log"
 	"time"
 
 	"github.com/nsf/termbox-go"
-	"gopkg.in/inconshreveable/log15.v2"
 )
 
 const (
@@ -95,7 +95,7 @@ var (
 	boards []Boards
 
 	baseDir string
-	logger  log15.Logger
+	logger  *log.Logger
 	minos   *Minos
 	board   *Board
 	view    *View

keyInput.go

@@ -14,7 +14,7 @@ func NewKeyInput() *KeyInput {
 }
 
 func (keyInput *KeyInput) Run() {
-	logger.Info("KeyInput Run start")
+	logger.Println("KeyInput Run start")
 
 loop:
 	for {
@@ -33,15 +33,16 @@ loop:
 		}
 	}
 
-	logger.Info("KeyInput Run end")
+	logger.Println("KeyInput Run end")
 }
 
 func (keyInput *KeyInput) ProcessEvent(event *termbox.Event) {
 	if event.Key == termbox.KeyCtrlI {
-		// ctrl i to log stack trace
+		// Ctrl l (lower case L) to log stack trace
 		buffer := make([]byte, 1<<16)
 		length := runtime.Stack(buffer, true)
-		logger.Debug("Stack trace", "buffer", string(buffer[:length]))
+		logger.Println("Stack trace")
+		logger.Println(string(buffer[:length]))
 		return
 	}
 

mino_test.go

@@ -1,11 +1,10 @@
 package main
 
 import (
+	"log"
 	"math/rand"
 	"os"
 	"testing"
-
-	"gopkg.in/inconshreveable/log15.v2"
 )
 
 type testMinoStruct struct {
@@ -21,8 +20,7 @@ func TestMain(m *testing.M) {
 }
 
 func setupForTesting() {
-	logger = log15.New()
-	logger.SetHandler(log15.StreamHandler(os.Stdout, log15.LogfmtFormat()))
+	logger = log.New(os.Stdout, "", log.Ldate|log.Ltime|log.LUTC|log.Llongfile)
 
 	rand.Seed(1)
 

ranking.go

@@ -22,7 +22,7 @@ func NewRanking() *Ranking {
 
 	scoreBytes, err := ioutil.ReadFile(baseDir + rankingFileName)
 	if err != nil {
-		logger.Error("NewRanking ReadFile", "error", err.Error())
+		logger.Println("NewRanking ReadFile error:", err)
 	}
 
 	scoreStrings := strings.Split(string(scoreBytes), ",")
@@ -32,7 +32,7 @@ func NewRanking() *Ranking {
 		}
 		score, err := strconv.ParseUint(scoreString, 10, 64)
 		if err != nil {
-			logger.Error("NewRanking ParseUint", "error", err.Error())
+			logger.Println("NewRanking ParseUint error:", err)
 			score = 0
 		}
 		ranking.scores[index] = score

tetris.go

@@ -1,20 +1,22 @@
 package main
 
 import (
+	"log"
 	"math/rand"
 	"os"
 	"path/filepath"
 	"time"
-
-	"gopkg.in/inconshreveable/log15.v2"
 )
 
 func main() {
 	baseDir, _ = filepath.Abs(filepath.Dir(os.Args[0]))
-	logger = log15.New()
-	if baseDir != "" {
-		logger.SetHandler(log15.Must.FileHandler(baseDir+"/tetris.log", log15.LogfmtFormat()))
+	logger = log.New(os.Stderr, "", log.Ldate|log.Ltime|log.LUTC|log.Llongfile)
+	logFile, err := os.OpenFile(baseDir+"/go-tetris.log", os.O_RDWR|os.O_CREATE|os.O_APPEND, 0644)
+	if err != nil {
+		log.Fatal("error opening logFile:", err)
 	}
+	defer logFile.Close()
+	logger.SetOutput(logFile)
 
 	rand.Seed(time.Now().UnixNano())
 

view.go

@@ -19,11 +19,11 @@ func NewView() {
 }
 
 func (view *View) Stop() {
-	logger.Info("View Stop start")
+	logger.Println("View Stop start")
 
 	termbox.Close()
 
-	logger.Info("View Stop end")
+	logger.Println("View Stop end")
 }
 
 func (view *View) RefreshScreen() {
@@ -217,7 +217,7 @@ func (view *View) ShowDeleteAnimation(lines []int) {
 }
 
 func (view *View) ShowGameOverAnimation() {
-	logger.Info("View ShowGameOverAnimation start")
+	logger.Println("View ShowGameOverAnimation start")
 
 	switch rand.Intn(3) {
 	case 0:
@@ -280,7 +280,7 @@ func (view *View) ShowGameOverAnimation() {
 		}
 	}
 
-	logger.Info("View ShowGameOverAnimation end")
+	logger.Println("View ShowGameOverAnimation end")
 }
 
 func (view *View) colorizeLine(y int, color termbox.Attribute) {