Addressing review comments

ptman · ptman · commit 20d059a88074 · 2016-05-31T16:24:24.000+03:00
diff --git a/cache/cache_test.go b/cache/cache_test.go
@@ -80,7 +80,7 @@ func expiration(t *testing.T, newCache cacheFactory) {
 	// Test Set w/ DEFAULT
 	value := 10
 	if err = cache.Set("int", value, DEFAULT); err != nil {
-		panic(err)
+		t.Errorf("Set failed: %s", err)
 	}
 	time.Sleep(2 * time.Second)
 	err = cache.Get("int", &value)
@@ -90,7 +90,7 @@ func expiration(t *testing.T, newCache cacheFactory) {
 
 	// Test Set w/ short time
 	if err = cache.Set("int", value, time.Second); err != nil {
-		panic(err)
+		t.Errorf("Set failed: %s", err)
 	}
 	time.Sleep(2 * time.Second)
 	err = cache.Get("int", &value)
@@ -100,7 +100,7 @@ func expiration(t *testing.T, newCache cacheFactory) {
 
 	// Test Set w/ longer time.
 	if err = cache.Set("int", value, time.Hour); err != nil {
-		panic(err)
+		t.Errorf("Set failed: %s", err)
 	}
 	time.Sleep(2 * time.Second)
 	err = cache.Get("int", &value)
@@ -110,7 +110,7 @@ func expiration(t *testing.T, newCache cacheFactory) {
 
 	// Test Set w/ forever.
 	if err = cache.Set("int", value, FOREVER); err != nil {
-		panic(err)
+		t.Errorf("Set failed: %s", err)
 	}
 	time.Sleep(2 * time.Second)
 	err = cache.Get("int", &value)
diff --git a/cache/memcached_test.go b/cache/memcached_test.go
@@ -13,7 +13,7 @@ var newMemcachedCache = func(t *testing.T, defaultExpiration time.Duration) Cach
 	c, err := net.Dial("tcp", testServer)
 	if err == nil {
 		if _, err = c.Write([]byte("flush_all\r\n")); err != nil {
-			panic(err)
+			t.Errorf("Write failed: %s", err)
 		}
 		_ = c.Close()
 		return NewMemcachedCache([]string{testServer}, defaultExpiration)
diff --git a/cache/redis.go b/cache/redis.go
@@ -178,7 +178,7 @@ func (c RedisCache) Increment(key string, delta uint64) (uint64, error) {
 	if err != nil {
 		return 0, err
 	}
-	var sum = currentVal + int64(delta)
+	sum := currentVal + int64(delta)
 	_, err = conn.Do("SET", key, sum)
 	if err != nil {
 		return 0, err
diff --git a/cache/redis_test.go b/cache/redis_test.go
@@ -18,12 +18,12 @@ var newRedisCache = func(t *testing.T, defaultExpiration time.Duration) Cache {
 	c, err := net.Dial("tcp", redisTestServer)
 	if err == nil {
 		if _, err = c.Write([]byte("flush_all\r\n")); err != nil {
-			panic(err)
+			t.Errorf("Write failed: %s", err)
 		}
 		_ = c.Close()
 		redisCache := NewRedisCache(redisTestServer, "", defaultExpiration)
 		if err = redisCache.Flush(); err != nil {
-			panic(err)
+			t.Errorf("Flush failed: %s", err)
 		}
 		return redisCache
 	}
diff --git a/compress_test.go b/compress_test.go
@@ -12,7 +12,7 @@ func TestBenchmarkCompressed(t *testing.T) {
 	resp := httptest.NewRecorder()
 	c := NewController(NewRequest(showRequest), NewResponse(resp))
 	if err := c.SetAction("Hotels", "Show"); err != nil {
-		panic(err)
+		t.Errorf("SetAction failed: %s", err)
 	}
 	Config.SetOption("results.compressed", "true")
 	result := Hotels{c}.Show(3)
@@ -28,7 +28,7 @@ func BenchmarkRenderCompressed(b *testing.B) {
 	resp.Body = nil
 	c := NewController(NewRequest(showRequest), NewResponse(resp))
 	if err := c.SetAction("Hotels", "Show"); err != nil {
-		panic(err)
+		b.Errorf("SetAction failed: %s", err)
 	}
 	Config.SetOption("results.compressed", "true")
 	b.ResetTimer()
@@ -45,7 +45,7 @@ func BenchmarkRenderUnCompressed(b *testing.B) {
 	resp.Body = nil
 	c := NewController(NewRequest(showRequest), NewResponse(resp))
 	if err := c.SetAction("Hotels", "Show"); err != nil {
-		panic(err)
+		b.Errorf("SetAction failed: %s", err)
 	}
 	Config.SetOption("results.compressed", "false")
 	b.ResetTimer()
diff --git a/controller.go b/controller.go
@@ -383,8 +383,8 @@ var controllers = make(map[string]*ControllerType)
 func RegisterController(c interface{}, methods []*MethodType) {
 	// De-star the controller type
 	// (e.g. given TypeOf((*Application)(nil)), want TypeOf(Application))
-	var t = reflect.TypeOf(c)
-	var elem = t.Elem()
+	t := reflect.TypeOf(c)
+	elem := t.Elem()
 
 	// De-star all of the method arg types too.
 	for _, m := range methods {
diff --git a/errors.go b/errors.go
@@ -99,7 +99,7 @@ func (e *Error) ContextSource() []sourceLine {
 		end = len(e.SourceLines)
 	}
 
-	var lines = make([]sourceLine, end-start)
+	lines := make([]sourceLine, end-start)
 	for i, src := range e.SourceLines[start:end] {
 		fileLine := start + i + 1
 		lines[i] = sourceLine{src, fileLine, fileLine == e.Line}
diff --git a/http.go b/http.go
@@ -108,11 +108,11 @@ func (al AcceptLanguages) String() string {
 	output := bytes.NewBufferString("")
 	for i, language := range al {
 		if _, err := output.WriteString(fmt.Sprintf("%s (%1.1f)", language.Language, language.Quality)); err != nil {
-			panic(err)
+			ERROR.Println("WriteString failed:", err)
 		}
 		if i != len(al)-1 {
 			if _, err := output.WriteString(", "); err != nil {
-				panic(err)
+				ERROR.Println("WriteString failed:", err)
 			}
 		}
 	}
diff --git a/libs.go b/libs.go
@@ -16,7 +16,8 @@ func Sign(message string) string {
 	}
 	mac := hmac.New(sha1.New, secretKey)
 	if _, err := io.WriteString(mac, message); err != nil {
-		panic(err)
+		ERROR.Println("WriteString failed:", err)
+		return ""
 	}
 	return hex.EncodeToString(mac.Sum(nil))
 }
diff --git a/results.go b/results.go
@@ -100,11 +100,11 @@ func (r ErrorResult) Apply(req *Request, resp *Response) {
 	if req.Method != "WS" {
 		resp.WriteHeader(status, contentType)
 		if _, err := b.WriteTo(resp.Out); err != nil {
-			panic(err)
+			ERROR.Println("WriteTo failed:", err)
 		}
 	} else {
 		if err := websocket.Message.Send(req.Websocket, fmt.Sprint(revelError)); err != nil {
-			panic(err)
+			ERROR.Println("Send failed:", err)
 		}
 	}
 
diff --git a/results_test.go b/results_test.go
@@ -12,7 +12,7 @@ func TestBenchmarkRender(t *testing.T) {
 	resp := httptest.NewRecorder()
 	c := NewController(NewRequest(showRequest), NewResponse(resp))
 	if err := c.SetAction("Hotels", "Show"); err != nil {
-		panic(err)
+		t.Errorf("SetAction failed: %s", err)
 	}
 	result := Hotels{c}.Show(3)
 	result.Apply(c.Request, c.Response)
@@ -27,7 +27,7 @@ func BenchmarkRenderChunked(b *testing.B) {
 	resp.Body = nil
 	c := NewController(NewRequest(showRequest), NewResponse(resp))
 	if err := c.SetAction("Hotels", "Show"); err != nil {
-		panic(err)
+		b.Errorf("SetAction failed: %s", err)
 	}
 	Config.SetOption("results.chunked", "true")
 	b.ResetTimer()
@@ -44,7 +44,7 @@ func BenchmarkRenderNotChunked(b *testing.B) {
 	resp.Body = nil
 	c := NewController(NewRequest(showRequest), NewResponse(resp))
 	if err := c.SetAction("Hotels", "Show"); err != nil {
-		panic(err)
+		b.Errorf("SetAction failed: %s", err)
 	}
 	Config.SetOption("results.chunked", "false")
 	b.ResetTimer()
diff --git a/router.go b/router.go
@@ -264,8 +264,7 @@ func routeError(err error, routesPath, content string, n int) *Error {
 	}
 	// Load the route file content if necessary
 	if content == "" {
-		contentBytes, er := ioutil.ReadFile(routesPath)
-		if er != nil {
+		if contentBytes, er := ioutil.ReadFile(routesPath); er != nil {
 			ERROR.Printf("Failed to read route file %s: %s\n", routesPath, er)
 		} else {
 			content = string(contentBytes)
@@ -305,7 +304,7 @@ var routePattern = regexp.MustCompile(
 		`\(?([^)]*)\)?[ \t]*$`)
 
 func parseRouteLine(line string) (method, path, action, fixedArgs string, found bool) {
-	var matches = routePattern.FindStringSubmatch(line)
+	matches := routePattern.FindStringSubmatch(line)
 	if matches == nil {
 		return
 	}
@@ -425,7 +424,7 @@ func init() {
 
 func RouterFilter(c *Controller, fc []Filter) {
 	// Figure out the Controller/Action
-	var route = MainRouter.Route(c.Request.Request)
+	route := MainRouter.Route(c.Request.Request)
 	if route == nil {
 		c.Result = c.NotFound("No matching route found: " + c.Request.RequestURI)
 		return
diff --git a/router_test.go b/router_test.go
@@ -258,7 +258,7 @@ func TestRouteMatches(t *testing.T) {
 	router := NewRouter("")
 	router.Routes, _ = parseRoutes("", "", TEST_ROUTES, false)
 	if err := router.updateTree(); err != nil {
-		panic(err)
+		t.Errorf("updateTree failed: %s", err)
 	}
 	for req, expected := range routeMatchTestCases {
 		t.Log("Routing:", req.Method, req.URL)
@@ -357,7 +357,7 @@ func BenchmarkRouter(b *testing.B) {
 	router := NewRouter("")
 	router.Routes, _ = parseRoutes("", "", TEST_ROUTES, false)
 	if err := router.updateTree(); err != nil {
-		panic(err)
+		b.Errorf("updateTree failed: %s", err)
 	}
 	b.ResetTimer()
 	for i := 0; i < b.N/len(routeMatchTestCases); i++ {
@@ -396,7 +396,7 @@ func BenchmarkLargeRouter(b *testing.B) {
 			NewRoute("GET", p, "Controller.Action", "", "", 0))
 	}
 	if err := router.updateTree(); err != nil {
-		panic(err)
+		b.Errorf("updateTree failed: %s", err)
 	}
 
 	requestUrls := []string{
diff --git a/server.go b/server.go
@@ -32,7 +32,7 @@ func handle(w http.ResponseWriter, r *http.Request) {
 		websocket.Handler(func(ws *websocket.Conn) {
 			//Override default Read/Write timeout with sane value for a web socket request
 			if err := ws.SetDeadline(time.Now().Add(time.Hour * 24)); err != nil {
-				panic(err)
+				ERROR.Println("SetDeadLine failed:", err)
 			}
 			r.Method = "WS"
 			handleInternal(w, r, ws)
diff --git a/util.go b/util.go
@@ -38,7 +38,7 @@ type ExecutableTemplate interface {
 func ExecuteTemplate(tmpl ExecutableTemplate, data interface{}) string {
 	var b bytes.Buffer
 	if err := tmpl.Execute(&b, data); err != nil {
-		panic(err)
+		ERROR.Println("Execute failed:", err)
 	}
 	return b.String()
 }

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ var newMemcachedCache = func(t *testing.T, defaultExpiration time.Duration) Cach`
`13`	`13`	`c, err := net.Dial("tcp", testServer)`
`14`	`14`	`if err == nil {`
`15`	`15`	`if _, err = c.Write([]byte("flush_all\r\n")); err != nil {`
`16`		`- panic(err)`
	`16`	`+ t.Errorf("Write failed: %s", err)`
`17`	`17`	`}`
`18`	`18`	`_ = c.Close()`
`19`	`19`	`return NewMemcachedCache([]string{testServer}, defaultExpiration)`
Original file line number	Diff line number	Diff line change
`@@ -178,7 +178,7 @@ func (c RedisCache) Increment(key string, delta uint64) (uint64, error) {`
`178`	`178`	`if err != nil {`
`179`	`179`	`return 0, err`
`180`	`180`	`}`
`181`		`- var sum = currentVal + int64(delta)`
	`181`	`+ sum := currentVal + int64(delta)`
`182`	`182`	`_, err = conn.Do("SET", key, sum)`
`183`	`183`	`if err != nil {`
`184`	`184`	`return 0, err`
Original file line number	Diff line number	Diff line change
`@@ -18,12 +18,12 @@ var newRedisCache = func(t *testing.T, defaultExpiration time.Duration) Cache {`
`18`	`18`	`c, err := net.Dial("tcp", redisTestServer)`
`19`	`19`	`if err == nil {`
`20`	`20`	`if _, err = c.Write([]byte("flush_all\r\n")); err != nil {`
`21`		`- panic(err)`
	`21`	`+ t.Errorf("Write failed: %s", err)`
`22`	`22`	`}`
`23`	`23`	`_ = c.Close()`
`24`	`24`	`redisCache := NewRedisCache(redisTestServer, "", defaultExpiration)`
`25`	`25`	`if err = redisCache.Flush(); err != nil {`
`26`		`- panic(err)`
	`26`	`+ t.Errorf("Flush failed: %s", err)`
`27`	`27`	`}`
`28`	`28`	`return redisCache`
`29`	`29`	`}`
Original file line number	Diff line number	Diff line change
`@@ -99,7 +99,7 @@ func (e *Error) ContextSource() []sourceLine {`
`99`	`99`	`end = len(e.SourceLines)`
`100`	`100`	`}`
`101`	`101`
`102`		`- var lines = make([]sourceLine, end-start)`
	`102`	`+ lines := make([]sourceLine, end-start)`
`103`	`103`	`for i, src := range e.SourceLines[start:end] {`
`104`	`104`	`fileLine := start + i + 1`
`105`	`105`	`lines[i] = sourceLine{src, fileLine, fileLine == e.Line}`
Original file line number	Diff line number	Diff line change
`@@ -108,11 +108,11 @@ func (al AcceptLanguages) String() string {`
`108`	`108`	`output := bytes.NewBufferString("")`
`109`	`109`	`for i, language := range al {`
`110`	`110`	`if _, err := output.WriteString(fmt.Sprintf("%s (%1.1f)", language.Language, language.Quality)); err != nil {`
`111`		`- panic(err)`
	`111`	`+ ERROR.Println("WriteString failed:", err)`
`112`	`112`	`}`
`113`	`113`	`if i != len(al)-1 {`
`114`	`114`	`if _, err := output.WriteString(", "); err != nil {`
`115`		`- panic(err)`
	`115`	`+ ERROR.Println("WriteString failed:", err)`
`116`	`116`	`}`
`117`	`117`	`}`
`118`	`118`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,8 @@ func Sign(message string) string {`
`16`	`16`	`}`
`17`	`17`	`mac := hmac.New(sha1.New, secretKey)`
`18`	`18`	`if _, err := io.WriteString(mac, message); err != nil {`
`19`		`- panic(err)`
	`19`	`+ ERROR.Println("WriteString failed:", err)`
	`20`	`+ return ""`
`20`	`21`	`}`
`21`	`22`	`return hex.EncodeToString(mac.Sum(nil))`
`22`	`23`	`}`
Original file line number	Diff line number	Diff line change
`@@ -100,11 +100,11 @@ func (r ErrorResult) Apply(req Request, resp Response) {`
`100`	`100`	`if req.Method != "WS" {`
`101`	`101`	`resp.WriteHeader(status, contentType)`
`102`	`102`	`if _, err := b.WriteTo(resp.Out); err != nil {`
`103`		`- panic(err)`
	`103`	`+ ERROR.Println("WriteTo failed:", err)`
`104`	`104`	`}`
`105`	`105`	`} else {`
`106`	`106`	`if err := websocket.Message.Send(req.Websocket, fmt.Sprint(revelError)); err != nil {`
`107`		`- panic(err)`
	`107`	`+ ERROR.Println("Send failed:", err)`
`108`	`108`	`}`
`109`	`109`	`}`
`110`	`110`