Cleanup error printing.

6 files changed, 14 insertions, 13 deletions

diff --git a/go/storage/cdb_map.go b/go/storage/cdb_map.go
index fbb59e9c0..1902ea5eb 100644
--- a/go/storage/cdb_map.go
+++ b/go/storage/cdb_map.go
@@ -214,12 +214,12 @@ func DumpNeedleMapToCdb(cdbName string, nm *NeedleMap) error {
 func openTempCdb(fileName string) (cdb.AdderFunc, cdb.CloserFunc, error) {
 	fh, err := os.Create(fileName)
 	if err != nil {
-		return nil, nil, fmt.Errorf("cannot create cdb file %s: %s", fileName, err.Error())
+		return nil, nil, fmt.Errorf("cannot create cdb file %s: %v", fileName, err)
 	}
 	adder, closer, err := cdb.MakeFactory(fh)
 	if err != nil {
 		fh.Close()
-		return nil, nil, fmt.Errorf("error creating factory: %s", err.Error())
+		return nil, nil, fmt.Errorf("error creating factory: %v", err)
 	}
 	return adder, func() error {
 		if e := closer(); e != nil {
diff --git a/go/storage/needle_map.go b/go/storage/needle_map.go
index 504ca1552..98a85b7ab 100644
--- a/go/storage/needle_map.go
+++ b/go/storage/needle_map.go
@@ -126,7 +126,7 @@ func (nm *NeedleMap) Put(key uint64, offset uint32, size uint32) (int, error) {
 		nm.DeletionByteCounter = nm.DeletionByteCounter + uint64(oldSize)
 	}
 	if _, err := nm.indexFile.Seek(0, 2); err != nil {
-		return 0, fmt.Errorf("cannot go to the end of indexfile %s: %s", nm.indexFile.Name(), err.Error())
+		return 0, fmt.Errorf("cannot go to the end of indexfile %s: %v", nm.indexFile.Name(), err)
 	}
 	return nm.indexFile.Write(bytes)
 }
@@ -141,10 +141,10 @@ func (nm *NeedleMap) Delete(key uint64) error {
 	util.Uint32toBytes(bytes[8:12], 0)
 	util.Uint32toBytes(bytes[12:16], 0)
 	if _, err := nm.indexFile.Seek(0, 2); err != nil {
-		return fmt.Errorf("cannot go to the end of indexfile %s: %s", nm.indexFile.Name(), err.Error())
+		return fmt.Errorf("cannot go to the end of indexfile %s: %v", nm.indexFile.Name(), err)
 	}
 	if _, err := nm.indexFile.Write(bytes); err != nil {
-		return fmt.Errorf("error writing to indexfile %s: %s", nm.indexFile.Name(), err.Error())
+		return fmt.Errorf("error writing to indexfile %s: %v", nm.indexFile.Name(), err)
 	}
 	nm.DeletionCounter++
 	return nil
diff --git a/go/storage/needle_read_write.go b/go/storage/needle_read_write.go
index 663b5abbd..36ae2aa85 100644
--- a/go/storage/needle_read_write.go
+++ b/go/storage/needle_read_write.go
@@ -30,12 +30,12 @@ func (n *Needle) Append(w io.Writer, version Version) (size uint32, err error) {
 			defer func(s io.Seeker, off int64) {
 				if err != nil {
 					if _, e = s.Seek(off, 0); e != nil {
-						glog.V(0).Infof("Failed to seek %s back to %d with error: %s", w, off, e.Error())
+						glog.V(0).Infof("Failed to seek %s back to %d with error: %v", w, off, e)
 					}
 				}
 			}(s, end)
 		} else {
-			err = fmt.Errorf("Cnnot Read Current Volume Position: %s", e.Error())
+			err = fmt.Errorf("Cnnot Read Current Volume Position: %v", e)
 			return
 		}
 	}
diff --git a/go/storage/volume.go b/go/storage/volume.go
index a1eccd62c..46d41dc2b 100644
--- a/go/storage/volume.go
+++ b/go/storage/volume.go
@@ -287,10 +287,10 @@ func ScanVolumeFile(dirname string, collection string, id VolumeId,
 	visitNeedle func(n *Needle, offset int64) error) (err error) {
 	var v *Volume
 	if v, err = loadVolumeWithoutIndex(dirname, collection, id); err != nil {
-		return errors.New("Failed to load volume:" + err.Error())
+		return fmt.Errorf("Failed to load volume %d: %v", id, err)
 	}
 	if err = visitSuperBlock(v.SuperBlock); err != nil {
-		return errors.New("Failed to read super block:" + err.Error())
+		return fmt.Errorf("Failed to read volume %d super block: %v", id, err)
 	}
 
 	version := v.Version()
diff --git a/go/storage/volume_info.go b/go/storage/volume_info.go
index bc8049ea4..a7f3acf2b 100644
--- a/go/storage/volume_info.go
+++ b/go/storage/volume_info.go
@@ -39,5 +39,6 @@ func NewVolumeInfo(m *operation.VolumeInformationMessage) (vi VolumeInfo, err er
 }
 
 func (vi VolumeInfo) String() string {
-	return fmt.Sprintf("Id:%s, Size:%d, ReplicaPlacement:%s, Collection:%s, Version:%v, FileCount:%d, DeleteCount:%d, DeletedByteCount:%d, ReadOnly:%v", vi.Id, vi.Size, vi.ReplicaPlacement, vi.Collection, vi.Version, vi.FileCount, vi.DeleteCount, vi.DeletedByteCount, vi.ReadOnly)
+	return fmt.Sprintf("Id:%d, Size:%d, ReplicaPlacement:%s, Collection:%s, Version:%v, FileCount:%d, DeleteCount:%d, DeletedByteCount:%d, ReadOnly:%v",
+		vi.Id, vi.Size, vi.ReplicaPlacement, vi.Collection, vi.Version, vi.FileCount, vi.DeleteCount, vi.DeletedByteCount, vi.ReadOnly)
 }
diff --git a/go/storage/volume_super_block.go b/go/storage/volume_super_block.go
index 57e0deea9..2fb2ed4bf 100644
--- a/go/storage/volume_super_block.go
+++ b/go/storage/volume_super_block.go
@@ -38,7 +38,7 @@ func (s *SuperBlock) Bytes() []byte {
 func (v *Volume) maybeWriteSuperBlock() error {
 	stat, e := v.dataFile.Stat()
 	if e != nil {
-		glog.V(0).Infof("failed to stat datafile %s: %s", v.dataFile, e.Error())
+		glog.V(0).Infof("failed to stat datafile %s: %v", v.dataFile, e)
 		return e
 	}
 	if stat.Size() == 0 {
@@ -57,11 +57,11 @@ func (v *Volume) maybeWriteSuperBlock() error {
 }
 func (v *Volume) readSuperBlock() (err error) {
 	if _, err = v.dataFile.Seek(0, 0); err != nil {
-		return fmt.Errorf("cannot seek to the beginning of %s: %s", v.dataFile.Name(), err.Error())
+		return fmt.Errorf("cannot seek to the beginning of %s: %v", v.dataFile.Name(), err)
 	}
 	header := make([]byte, SuperBlockSize)
 	if _, e := v.dataFile.Read(header); e != nil {
-		return fmt.Errorf("cannot read superblock: %s", e.Error())
+		return fmt.Errorf("cannot read volume %d super block: %v", v.Id, e)
 	}
 	v.SuperBlock, err = ParseSuperBlock(header)
 	return err