From 435642ef0144e7a6edc19ccd38f09d50b4e6ff51 Mon Sep 17 00:00:00 2001
From: Travis <treeder@gmail.com>
Date: Wed, 16 Jan 2013 00:52:06 -0800
Subject: [PATCH] using common for all json reading.

---
 register_host.rb     | 2 +-
 src/router/router.go | 6 ++----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/register_host.rb b/register_host.rb
index 9ccd2d215..a28ee9ab6 100644
--- a/register_host.rb
+++ b/register_host.rb
@@ -17,7 +17,7 @@ code_name = @config[:iron][:code_name] || "sinatra"
 response = rest.post(
 # "http://localhost:8080/",
     "http://router.irondns.info/?project_id=#{project_id}&token=#{token}&code_name=#{code_name}",
-	headers: {"Iron-Router"=>"register"},
+	headers: {"Iron-Router"=>"register", "Content-Type"=>"application/json"},
 	body: {"host"=>host_name, "code"=>code_name}
 	)
 puts "response body:"
diff --git a/src/router/router.go b/src/router/router.go
index 67914c9d4..70c70b703 100644
--- a/src/router/router.go
+++ b/src/router/router.go
@@ -214,10 +214,8 @@ func AddWorker(w http.ResponseWriter, req *http.Request) {
 
 	} else {
 		r2 := Route2{}
-		decoder := json.NewDecoder(req.Body)
-		err := decoder.Decode(&r2)
-		if err != nil {
-			common.SendError(w, 400, fmt.Sprintln("Bad json:", err))
+		if !common.ReadJSON(w, req, &r2) {
+			return
 		}
 		// todo: do we need to close body?
 		fmt.Println("DECODED:", r2)