peterhellberg · January 18, 2019 01:58 · Apr 29, 2014 · Apr 29, 2014 · Mar 9, 2014 · Mar 9, 2014
diff --git a/api.go b/api.go
@@ -15,21 +15,21 @@ var (
 	maxConnections = flag.Int("max-connections", 10, "Max connections to Redis")
 )
 
-var redisPool = redis.NewPool(func() (redis.Conn, error) {
-	c, err := redis.Dial("tcp", *redisAddress)
-
-	if err != nil {
-		return nil, err
-	}
-
-	return c, err
-}, *maxConnections)
-
 func main() {
 	martini.Env = martini.Prod
 
 	flag.Parse()
 
+	redisPool := redis.NewPool(func() (redis.Conn, error) {
+		c, err := redis.Dial("tcp", *redisAddress)
+
+		if err != nil {
+			return nil, err
+		}
+
+		return c, err
+	}, *maxConnections)
+
 	defer redisPool.Close()
 
 	m := martini.Classic()

diff --git a/api.go b/api.go
@@ -34,17 +34,19 @@ func main() {
 
 	m := martini.Classic()
 
+	m.Map(redisPool)
+
 	m.Use(render.Renderer())
 
 	m.Get("/", func() string {
 		return "Hello from Martini!"
 	})
 
-	m.Get("/set/:key", func(r render.Render, params martini.Params, req *http.Request) {
+	m.Get("/set/:key", func(r render.Render, pool *redis.Pool, params martini.Params, req *http.Request) {
 		key := params["key"]
 		value := req.URL.Query().Get("value")
 
-		c := redisPool.Get()
+		c := pool.Get()
 		defer c.Close()
 
 		status, err := c.Do("SET", key, value)
@@ -61,10 +63,10 @@ func main() {
 		}
 	})
 
-	m.Get("/get/:key", func(r render.Render, params martini.Params) {
+	m.Get("/get/:key", func(r render.Render, pool *redis.Pool, params martini.Params) {
 		key := params["key"]
 
-		c := redisPool.Get()
+		c := pool.Get()
 		defer c.Close()
 
 		value, err := redis.String(c.Do("GET", key))

diff --git a/api.go b/api.go
@@ -45,6 +45,7 @@ func main() {
 		value := req.URL.Query().Get("value")
 
 		c := redisPool.Get()
+		defer c.Close()
 
 		status, err := c.Do("SET", key, value)
 
@@ -64,6 +65,7 @@ func main() {
 		key := params["key"]
 
 		c := redisPool.Get()
+		defer c.Close()
 
 		value, err := redis.String(c.Do("GET", key))
 
@@ -81,4 +83,4 @@ func main() {
 	})
 
 	m.Run()
-}
+}
diff --git a/api.go b/api.go
@@ -0,0 +1,84 @@
+package main
+
+import (
+	"flag"
+	"fmt"
+	"net/http"
+
+	"github.com/codegangsta/martini"
+	"github.com/garyburd/redigo/redis"
+	"github.com/martini-contrib/render"
+)
+
+var (
+	redisAddress   = flag.String("redis-address", ":6379", "Address to the Redis server")
+	maxConnections = flag.Int("max-connections", 10, "Max connections to Redis")
+)
+
+var redisPool = redis.NewPool(func() (redis.Conn, error) {
+	c, err := redis.Dial("tcp", *redisAddress)
+
+	if err != nil {
+		return nil, err
+	}
+
+	return c, err
+}, *maxConnections)
+
+func main() {
+	martini.Env = martini.Prod
+
+	flag.Parse()
+
+	defer redisPool.Close()
+
+	m := martini.Classic()
+
+	m.Use(render.Renderer())
+
+	m.Get("/", func() string {
+		return "Hello from Martini!"
+	})
+
+	m.Get("/set/:key", func(r render.Render, params martini.Params, req *http.Request) {
+		key := params["key"]
+		value := req.URL.Query().Get("value")
+
+		c := redisPool.Get()
+
+		status, err := c.Do("SET", key, value)
+
+		if err != nil {
+			message := fmt.Sprintf("Could not SET %s:%s", key, value)
+
+			r.JSON(400, map[string]interface{}{
+				"status":  "ERR",
+				"message": message})
+		} else {
+			r.JSON(200, map[string]interface{}{
+				"status": status})
+		}
+	})
+
+	m.Get("/get/:key", func(r render.Render, params martini.Params) {
+		key := params["key"]
+
+		c := redisPool.Get()
+
+		value, err := redis.String(c.Do("GET", key))
+
+		if err != nil {
+			message := fmt.Sprintf("Could not GET %s", key)
+
+			r.JSON(400, map[string]interface{}{
+				"status":  "ERR",
+				"message": message})
+		} else {
+			r.JSON(200, map[string]interface{}{
+				"status": "OK",
+				"value":  value})
+		}
+	})
+
+	m.Run()
+}