Browse Source

Added log.Panicf(), so we can log our panics.

Steve Thielemann 3 years ago
parent
commit
c95b43b674
3 changed files with 9 additions and 8 deletions
  1. 2 1
      door/color.go
  2. 5 5
      door/door.go
  3. 2 2
      door/menu.go

+ 2 - 1
door/color.go

@@ -2,6 +2,7 @@ package door
 
 import (
 	"fmt"
+	"log"
 	"strings"
 )
 
@@ -111,7 +112,7 @@ func ColorText(color string) string {
 		//	result = append(result, 7)
 
 		default:
-			panic(fmt.Sprintf("ColorText Unknown: [%s] in %s", part, color))
+			log.Panicf("ColorText Unknown: [%s] in %s\n", part, color)
 		}
 
 	}

+ 5 - 5
door/door.go

@@ -60,13 +60,13 @@ func (f *FIFOBuffer) Push(value int) {
 	f.data[f.index] = value
 	f.index++
 	if f.index > len(f.data) {
-		panic(fmt.Sprintf("Exceeded FIFOBuffer size %d %#v", len(f.data), f))
+		log.Panicf("Exceeded FIFOBuffer size %d %#v", len(f.data), f)
 	}
 }
 
 func (f *FIFOBuffer) Pop() int {
 	if f.index == 0 {
-		panic("Pop from empty FIFOBuffer.")
+		log.Panic("Pop from empty FIFOBuffer.")
 	}
 	f.index--
 	return f.data[f.index]
@@ -94,7 +94,7 @@ func (b *LIFOBuffer) Push(value int) {
 
 func (b *LIFOBuffer) Pop() int {
 	if b.index == 0 {
-		panic("Attempting to Pop from empty LIFOBuffer.")
+		log.Panic("Attempting to Pop from empty LIFOBuffer.")
 	}
 
 	b.index--
@@ -155,7 +155,7 @@ func (d *Door) TimeUsed() time.Duration {
 func (d *Door) ReadDropfile(filename string) {
 	file, err := os.Open(filename)
 	if err != nil {
-		panic(fmt.Sprintf("Open(%s): %s\n", filename, err))
+		log.Panicf("Open(%s): %s\n", filename, err)
 		// os.Exit(2)
 	}
 
@@ -285,7 +285,7 @@ func (d *Door) Init(doorname string) {
 	logfilename := fmt.Sprintf("%s-%d.log", doorname, d.Config.Node)
 	logf, err := os.OpenFile(logfilename, os.O_APPEND|os.O_CREATE|os.O_RDWR, 0666)
 	if err != nil {
-		panic(fmt.Sprintf("Error creating log file %s: %v", logfilename, err))
+		log.Panicf("Error creating log file %s: %v", logfilename, err)
 	}
 
 	log.SetOutput(logf)

+ 2 - 2
door/menu.go

@@ -1,7 +1,7 @@
 package door
 
 import (
-	"fmt"
+	"log"
 	"strings"
 	"unicode"
 )
@@ -69,7 +69,7 @@ func (m *Menu) AddSelection(key string, text string) {
 	m.Options = append(m.Options, rune(key[0]))
 
 	if len(text)+4 > m.Width {
-		panic(fmt.Sprintf("Menu (not wide enough) Width %d : text size %d + 4 = %d\n", m.Width, len(text), len(text)+4))
+		log.Panicf("Menu (not wide enough) Width %d : text size %d + 4 = %d\n", m.Width, len(text), len(text)+4)
 	}
 
 	linetext := "[" + key + "] " + text + strings.Repeat(" ", m.Width-(4+len(text)))