Switching service error response to JSON

fxbox · Mar 1, 2016 · f982f0d · f982f0d
1 parent 9f520eb
commit f982f0d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/src/controller.rs b/src/controller.rs
@@ -93,10 +93,11 @@ impl Controller for FoxBox {
         let services = self.services.lock().unwrap();
         match services.get(&id) {
             None => {
-                let mut response = Response::with(format!("No Such Service: {}", id));
+                let mut response = Response::with(format!(
+                    "{{\"result\": \"error\", \"details\": \"No Such Service: {}\"}}", id));
                 response.status = Some(Status::BadRequest);
                 response.headers.set(AccessControlAllowOrigin::Any);
-                response.headers.set(ContentType::plaintext());
+                response.headers.set(ContentType::json());
                 Ok(response)
             }
             Some(service) => {

diff --git a/src/service_router.rs b/src/service_router.rs
@@ -149,7 +149,8 @@ describe! service_router {
                         &service_router).unwrap();
 
         let result = response::extract_body_to_string(response);
-        assert_eq!(result, "No Such Service: unknown-id");
+        assert_eq!(result,
+            "{\"result\": \"error\", \"details\": \"No Such Service: unknown-id\"}");
     }
 
     it "should get the appropriate CORS headers" {