Merge branch 'development' into feature/Test-against-Mongo-minor-rele…

…ases-updates-as-of-Aug-2018
globalsign · Aug 28, 2018 · d8e0388 · d8e0388
2 parents c5bad38 + c6b12a3
commit d8e0388
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -3,8 +3,8 @@ language: go
 go_import_path: github.com/globalsign/mgo
 
 go:
-    - 1.9.x
     - 1.10.x
+    - 1.11.x
 
 env:
     global:
@@ -33,7 +33,7 @@ install:
 
 before_script:
     - golint  ./... | grep -v 'ID' | cat
-    - go vet github.com/globalsign/mgo/bson github.com/globalsign/mgo/txn github.com/globalsign/mgo 
+    - go vet github.com/globalsign/mgo/bson github.com/globalsign/mgo/txn github.com/globalsign/mgo
     - export NOIPV6=1
     - make startdb
 

diff --git a/gridfs.go b/gridfs.go
@@ -678,7 +678,7 @@ func (file *GridFile) insertChunk(data []byte) {
 // an error, if any.
 func (file *GridFile) Seek(offset int64, whence int) (pos int64, err error) {
 	file.m.Lock()
-	debugf("GridFile %p: seeking for %s (whence=%d)", file, offset, whence)
+	debugf("GridFile %p: seeking for %d (whence=%d)", file, offset, whence)
 	defer file.m.Unlock()
 	switch whence {
 	case os.SEEK_SET:

diff --git a/session.go b/session.go
@@ -3907,7 +3907,7 @@ func (db *Database) run(socket *mongoSocket, cmd, result interface{}) (err error
 	if result != nil {
 		err = bson.Unmarshal(data, result)
 		if err != nil {
-			debugf("Run command unmarshaling failed: %#v", op, err)
+			debugf("Run command unmarshaling: %#v, failed: %#v", op, err)
 			return err
 		}
 		if globalDebug && globalLogger != nil {