alihan/fn-serverless
1
0
Fork 0
mirror of https://github.com/fnproject/fn.git synced 2022-10-28 21:29:17 +03:00
Code Issues Packages Projects Releases Wiki Activity

not printing body anymore

Browse Source
This commit is contained in:
Travis
2013-01-16 00:42:43 -08:00
parent 8babfb84a6
commit e362ee9c51
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/router/router.go
View File

@@ -109,7 +109,7 @@ func ProxyFunc(w http.ResponseWriter, req *http.Request) {
route, err := getRoute(host) route, err := getRoute(host)
// choose random dest // choose random dest
if err != nil { if err != nil {
common.SendError(w, 400, fmt.Sprintln(w, "Host not configured or error!", err)) common.SendError(w, 400, fmt.Sprintln("Host not configured or error!", err))
return return
} }
// if route == nil { // route.Host == "" { // if route == nil { // route.Host == "" {
@@ -187,8 +187,8 @@ func ProxyFunc(w http.ResponseWriter, req *http.Request) {
func AddWorker(w http.ResponseWriter, req *http.Request) { func AddWorker(w http.ResponseWriter, req *http.Request) {
log.Println("AddWorker called!") log.Println("AddWorker called!")
s, err := ioutil.ReadAll(req.Body) // s, err := ioutil.ReadAll(req.Body)
fmt.Println("req.body:", err, string(s)) // fmt.Println("req.body:", err, string(s))
// get project id and token // get project id and token
projectId := req.FormValue("project_id") projectId := req.FormValue("project_id")
@@ -203,7 +203,7 @@ func AddWorker(w http.ResponseWriter, req *http.Request) {
decoder := json.NewDecoder(req.Body) decoder := json.NewDecoder(req.Body)
err := decoder.Decode(&route) err := decoder.Decode(&route)
if err != nil { if err != nil {
common.SendError(w, 400, fmt.Sprintln(w, "Bad json:", err)) common.SendError(w, 400, fmt.Sprintln("Bad json:", err))
} }
route.ProjectId = projectId route.ProjectId = projectId
route.Token = token route.Token = token
@@ -218,14 +218,14 @@ func AddWorker(w http.ResponseWriter, req *http.Request) {
decoder := json.NewDecoder(req.Body) decoder := json.NewDecoder(req.Body)
err = decoder.Decode(&r2) err = decoder.Decode(&r2)
if err != nil { if err != nil {
common.SendError(w, 400, fmt.Sprintln(w, "Bad json:", err)) common.SendError(w, 400, fmt.Sprintln("Bad json:", err))
} }
// todo: do we need to close body? // todo: do we need to close body?
fmt.Println("DECODED:", r2) fmt.Println("DECODED:", r2)
route, err := getRoute(r2.Host) route, err := getRoute(r2.Host)
// route := routingTable[r2.Host] // route := routingTable[r2.Host]
if err != nil { if err != nil {
common.SendError(w, 400, fmt.Sprintln(w, "This host is not registered!", err)) common.SendError(w, 400, fmt.Sprintln("This host is not registered!", err))
return return
// route = &Route{} // route = &Route{}
} }