Index: testservices/novaservice/service_http.go |
=== modified file 'testservices/novaservice/service_http.go' |
--- testservices/novaservice/service_http.go 2014-01-24 16:33:31 +0000 |
+++ testservices/novaservice/service_http.go 2014-05-02 01:12:04 +0000 |
@@ -297,6 +297,7 @@ |
return |
} |
var resp http.Handler |
+ |
if err == testservices.RateLimitExceededError { |
resp = errRateLimitExceeded |
} else if err == testservices.NoMoreFloatingIPs { |
@@ -306,9 +307,10 @@ |
} else { |
resp, _ = err.(http.Handler) |
if resp == nil { |
+ code, encodedErr := errorJSONEncode(err) |
resp = &errorResponse{ |
- http.StatusInternalServerError, |
- `{"internalServerError":{"message":"$ERROR$",code:500}}`, |
+ code, |
+ encodedErr, |
"application/json", |
err.Error(), |
nil, |
@@ -651,7 +653,7 @@ |
} |
server, err := n.server(serverId) |
if err != nil { |
- return errNotFoundJSON |
+ return err |
} |
if groups { |
srvGroups := n.allServerSecurityGroups(serverId) |