From bb6a87cd58c67d76296bbd2803a619bd0f10a24f Mon Sep 17 00:00:00 2001
From: Travis <treeder@gmail.com>
Date: Wed, 16 Jan 2013 01:07:30 -0800
Subject: [PATCH 1/2] more error logging

---
 src/router/router.go | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/router/router.go b/src/router/router.go
index 2dfe1726d..2d4986b38 100644
--- a/src/router/router.go
+++ b/src/router/router.go
@@ -267,7 +267,11 @@ func getRoute(host string) (Route, error) {
 
 func putRoute(route Route) (error) {
 	item := cache.Item{}
-	item.Value = route
-	err := icache.Put(route.Host, &item)
+	v, err := json.Marshal(route)
+	if err != nil {
+		return err
+	}
+	item.Value = string(v)
+	err = icache.Put(route.Host, &item)
 	return err
 }

From 66b2dca7925baf821f5e589be04af08ec6657c91 Mon Sep 17 00:00:00 2001
From: Travis <treeder@gmail.com>
Date: Wed, 16 Jan 2013 01:16:36 -0800
Subject: [PATCH 2/2] more bullshit

---
 src/router/router.go | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/router/router.go b/src/router/router.go
index 2d4986b38..3fa7856f0 100644
--- a/src/router/router.go
+++ b/src/router/router.go
@@ -218,7 +218,7 @@ func AddWorker(w http.ResponseWriter, req *http.Request) {
 		route.Token = token
 		route.CodeName = codeName
 		// todo: do we need to close body?
-		err := putRoute(route)
+		err := putRoute(&route)
 		if err != nil {
 			fmt.Println("couldn't register host:", err)
 			common.SendError(w, 400, fmt.Sprintln("Could not register host!", err))
@@ -256,16 +256,21 @@ func AddWorker(w http.ResponseWriter, req *http.Request) {
 	}
 }
 
-func getRoute(host string) (Route, error) {
+func getRoute(host string) (*Route, error) {
 	rx, err := icache.Get(host)
+	if err != nil {
+		return nil, err
+	}
+	rx2 := []byte(rx.(string))
 	route := Route{}
+	err = json.Unmarshal(rx2, &route)
 	if err == nil {
 		route = rx.(Route)
 	}
-	return route, err
+	return &route, err
 }
 
-func putRoute(route Route) (error) {
+func putRoute(route *Route) (error) {
 	item := cache.Item{}
 	v, err := json.Marshal(route)
 	if err != nil {