removed the Fatal logger

This commit is contained in:
Todd Gruben 2014-01-23 14:16:27 -06:00
parent 44857cde60
commit 21988f19ec
2 changed files with 10 additions and 7 deletions

View file

@ -314,12 +314,12 @@ func (d *Database) GetFragmentForBitmap(slice *Slice, bitmap *Bitmap) (*Fragment
frame, _ := d.getFrame(bitmap.FrameType)
fsi, err := d.GetFrameSliceIntersect(frame, slice)
if err != nil {
log.Fatal(err)
log.Println(err)
return nil, err
}
frag_id_s, err := fsi.hashring.Get(fmt.Sprintf("%d", bitmap.Id))
if err != nil {
log.Fatal(err)
log.Println(err)
return nil, err
}
frag_id := util.Hex_to_SUUID(frag_id_s)
@ -335,7 +335,8 @@ func (d *Database) GetFragmentById(fragment_id *uuid.UUID) *Fragment {
func (d *Database) getFragment(frame *Frame, slice *Slice, fragment_id util.SUUID) (*Fragment, error) {
fsi, err := d.GetFrameSliceIntersect(frame, slice)
if err != nil {
log.Fatal(err)
log.Println(err)
return nil, err
}
return fsi.GetFragment(fragment_id)
}
@ -343,7 +344,8 @@ func (d *Database) getFragment(frame *Frame, slice *Slice, fragment_id util.SUUI
func (d *Database) addFragment(frame *Frame, slice *Slice, fragment_id util.SUUID) *Fragment {
fsi, err := d.GetFrameSliceIntersect(frame, slice)
if err != nil {
log.Fatal(err)
log.Println(err)
return nil
}
fragment := Fragment{id: fragment_id}
fsi.AddFragment(&fragment)

View file

@ -1,11 +1,12 @@
package db
import (
"log"
"pilosa/util"
"testing"
"github.com/davecgh/go-spew/spew"
. "github.com/smartystreets/goconvey/convey"
"log"
"testing"
"pilosa/util"
)
func TestTopology(t *testing.T) {