improve logging

bilet.go

@@ -1,6 +1,8 @@
 package bilit
 
 import (
+	"log"
+	"os"
 	"regexp"
 )
 
@@ -11,6 +13,7 @@ var (
 	DefaultPattern = ".+"
 	//Debug enables printing of the map passed to a template
 	Debug = false
+	out   = log.New(os.Stdout, "", log.Lshortfile)
 )
 
 //Data is a data map for bilit
@@ -29,6 +32,13 @@ func (t Tmpl) RegEx() *regexp.Regexp {
 	return t.regex
 }
 
+func init() {
+	out.SetPrefix("[bilit] ")
+	if Debug {
+		out.SetPrefix("[bilit(DEBUG)] ")
+	}
+}
+
 //Template makes a template
 func Template(str string, pattern ...string) Tmpl {
 	if len(pattern) == 0 {

pull.go

@@ -1,9 +1,5 @@
 package bilit
 
-import (
-	"fmt"
-)
-
 func makePullRegex(str string, pattern string) string {
 	var substitution = "(?P<${groupName}>" + pattern + ")"
 	return GroupRegexp.ReplaceAllString(str, substitution)
@@ -12,17 +8,14 @@ func makePullRegex(str string, pattern string) string {
 //Pull extracts data from a populated string using a template
 func (t Tmpl) Pull(str string) map[string]string {
 	if Debug {
-		fmt.Println(t.regex)
+		out.Println(t.RegEx())
 	}
 	matches := map[string]string{}
 	for _, line := range t.RegEx().FindAllStringSubmatch(str, -1) {
-		if Debug {
-			println(line)
-		}
 		for n := 1; n < len(line); n++ {
 			name := t.RegEx().SubexpNames()[n]
 			if Debug {
-				println(name + ": " + line[n])
+				out.Println(name + ": " + line[n])
 			}
 			matches[name] = string(line[n])
 		}