update logxi which fixes errors with errors not being passed when disabled

Author: mgutz

glide.lock

@@ -10,9 +10,6 @@ import:
 - package: github.com/mgutz/jo
   subpackages:
   - v1
-- package: github.com/mgutz/logxi
-  subpackages:
-  - v1
 - package: github.com/mgutz/str
 - package: github.com/pmylund/go-cache
 - package: github.com/satori/go.uuid
@@ -22,4 +19,4 @@ import:
 - package: gopkg.in/stretchr/testify.v1
   subpackages:
   - assert
-
+- package: github.com/mgutz/logxi

glide.yaml

@@ -4,10 +4,10 @@ import (
 	"fmt"
 	"strconv"
 
-	"github.com/mgutz/logxi/v1"
+	"github.com/mgutz/logxi"
 )
 
-var logger log.Logger
+var logger logxi.Logger
 
 // Strict tells dat to raise errors
 var Strict = false
@@ -53,5 +53,5 @@ func init() {
 		identifierTab[i] = fmt.Sprintf("dat%d", i)
 	}
 
-	logger = log.New("dat")
+	logger = logxi.New("dat")
 }

init.go

@@ -1,11 +1,9 @@
 package kvs
 
-import (
-	"github.com/mgutz/logxi/v1"
-)
+import "github.com/mgutz/logxi"
 
-var logger log.Logger
+var logger logxi.Logger
 
 func init() {
-	logger = log.New("dat.cache")
+	logger = logxi.New("dat.cache")
 }

kvs/init.go

@@ -2,7 +2,6 @@ package runner
 
 import (
 	"database/sql"
-	"log"
 
 	"github.com/jmoiron/sqlx"
 	"gopkg.in/mgutz/dat.v1"
@@ -36,10 +35,10 @@ func pgMustNotAllowEscapeSequence(conn *DB) {
 	}
 
 	if standardConformingStrings != "on" {
-		log.Fatalf("Database allows escape sequences. Cannot be used with interpolation. "+
+		logger.Fatal("Database allows escape sequences. Cannot be used with interpolation. "+
 			"standard_conforming_strings=%q\n"+
 			"See http://www.postgresql.org/docs/9.3/interactive/sql-syntax-lexical.html#SQL-SYNTAX-STRINGS-ESCAPE",
-			standardConformingStrings)
+			"standardConformingStrings", standardConformingStrings)
 	}
 }
 

sqlx-runner/db.go

@@ -5,13 +5,13 @@ import (
 	"time"
 
 	"github.com/cenkalti/backoff"
-	"github.com/mgutz/logxi/v1"
+	"github.com/mgutz/logxi"
 	"gopkg.in/mgutz/dat.v1"
 	"gopkg.in/mgutz/dat.v1/kvs"
 	"gopkg.in/mgutz/dat.v1/postgres"
 )
 
-var logger log.Logger
+var logger logxi.Logger
 
 // LogQueriesThreshold is the threshold for logging "slow" queries
 var LogQueriesThreshold time.Duration
@@ -21,7 +21,7 @@ var LogErrNoRows bool
 
 func init() {
 	dat.Dialect = postgres.New()
-	logger = log.New("dat:sqlx")
+	logger = logxi.New("dat:sqlx")
 }
 
 // Cache caches query results.

sqlx-runner/init.go

@@ -7,7 +7,7 @@ import (
 	"os"
 	"time"
 
-	"github.com/mgutz/logxi/v1"
+	"github.com/mgutz/logxi"
 
 	"gopkg.in/mgutz/dat.v1"
 	"gopkg.in/mgutz/dat.v1/kvs"
@@ -22,7 +22,7 @@ func init() {
 	sqlDB = realDb()
 	testDB = NewDB(sqlDB, "postgres")
 	dat.Strict = false
-	log.Suppress(true)
+	logxi.Suppress(true)
 
 	Cache = kvs.NewMemoryKeyValueStore(1 * time.Second)
 	//Cache, _ = kvs.NewDefaultRedisStore()

sqlx-runner/init_test.go

@@ -2,7 +2,6 @@ package runner
 
 import (
 	"errors"
-	"log"
 	"sync"
 	"time"
 
@@ -138,7 +137,7 @@ func (tx *Tx) AutoCommit() error {
 	if err != nil {
 		tx.state = txErred
 		if dat.Strict {
-			log.Fatalf("Could not commit transaction: %s\n", err.Error())
+			logger.Fatal("Could not commit transaction", "err", err)
 		}
 		tx.popState()
 		return logger.Error("transaction.AutoCommit.commit_error", err)
@@ -163,7 +162,7 @@ func (tx *Tx) AutoRollback() error {
 	if err != nil {
 		tx.state = txErred
 		if dat.Strict {
-			log.Fatalf("Could not rollback transaction: %s\n", err.Error())
+			logger.Fatal("Could not rollback transaction", "err", err)
 		}
 		tx.popState()
 		return logger.Error("transaction.AutoRollback.rollback_error", err)