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

Little cleanup

Browse Source
This commit is contained in:
Travis
2013-01-17 12:56:16 -08:00
parent 67b266f514
commit 73fbbf0a7f
1 changed files with 11 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/router/router.go
View File

@@ -154,28 +154,17 @@ func serveEndpoint(w http.ResponseWriter, req *http.Request, route *Route) {
w.WriteHeader(http.StatusInternalServerError) w.WriteHeader(http.StatusInternalServerError)
// can't figure out how to compare types so comparing strings.... lame. // can't figure out how to compare types so comparing strings.... lame.
if strings.Contains(etype.String(), "net.OpError") { // == reflect.TypeOf(net.OpError{}) { // couldn't figure out a better way to do this if strings.Contains(etype.String(), "net.OpError") { // == reflect.TypeOf(net.OpError{}) { // couldn't figure out a better way to do this
if len(route.Destinations) > 3 { // always want at least two running golog.Infoln("It's a network error and less than three other workers available so we're going to remove it and start new task.")
golog.Infoln("It's a network error, removing this destination from routing table.") route.Destinations = append(route.Destinations[:destIndex], route.Destinations[destIndex + 1:]...)
route.Destinations = append(route.Destinations[:destIndex], route.Destinations[destIndex + 1:]...) err := putRoute(route)
err := putRoute(route) if err != nil {
if err != nil { golog.Infoln("couldn't update routing table:", err)
golog.Infoln("couldn't update routing table 1", err) common.SendError(w, 500, fmt.Sprintln("couldn't update routing table", err))
common.SendError(w, 500, fmt.Sprintln("couldn't update routing table 1", err)) return
return }
} golog.Infoln("New route:", route)
fmt.Println("New route:", route) if len(route.Destinations) < 3 {
// chooose another endpoint to serve // always want at least three running
} else {
golog.Infoln("It's a network error and less than three other workers available so we're going to remove it and start new task.")
route.Destinations = append(route.Destinations[:destIndex], route.Destinations[destIndex + 1:]...)
err := putRoute(route)
if err != nil {
golog.Infoln("couldn't update routing table:", err)
common.SendError(w, 500, fmt.Sprintln("couldn't update routing table", err))
return
}
golog.Infoln("New route:", route)
// start new worker if it's a connection error
startNewWorker(route) startNewWorker(route)
} }
serveEndpoint(w, req, route) serveEndpoint(w, req, route)