From 21988f19ec57d1880bd82182a611f7e5723fbec7 Mon Sep 17 00:00:00 2001 From: Todd Gruben Date: Thu, 23 Jan 2014 14:16:27 -0600 Subject: [PATCH] removed the Fatal logger --- db/topology.go | 10 ++++++---- db/topology_test.go | 7 ++++--- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/db/topology.go b/db/topology.go index 56dce5088..1e7f7fdf6 100644 --- a/db/topology.go +++ b/db/topology.go @@ -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) diff --git a/db/topology_test.go b/db/topology_test.go index 35d01d3d9..637b7a2f4 100644 --- a/db/topology_test.go +++ b/db/topology_test.go @@ -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) {