fix crash, so it kill the current process

Change-Id: I9c55d6d8cb5ab77b1a20266bb00ae96a433555a7
mikeivanov · Jul 19, 2011 · fe54599 · fe54599
1 parent d200d48
commit fe54599
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 8 deletions.
diff --git a/apps/app_node_service/main.js b/apps/app_node_service/main.js
@@ -27,8 +27,7 @@ var app = [
     res.respond('hello from node');
   }],
   [get(/^\/crash$/), function(req, res, name) {
-    res.writeHead(500, { 'content-type': 'text/plain' });
-    res.end();
+    process.kill(process.pid, 'SIGKILL');
   }],
   [get(/^\/service\/redis\/(\w+)$/), function(req, res, key) {
     var client = redis_services();

diff --git a/apps/app_rails_service/app/controllers/service_controller.rb b/apps/app_rails_service/app/controllers/service_controller.rb
@@ -9,7 +9,7 @@ def env
   end
 
   def crash
-    raise "It should crash"
+    Process.kill("KILL", Process.pid) 
   end
 
   def service

diff --git a/apps/app_sinatra_service/main.rb b/apps/app_sinatra_service/main.rb
@@ -15,7 +15,7 @@
 end
 
 get '/crash' do
-  raise "This should crash!!!!"
+  Process.kill("KILL", Process.pid)
 end
 
 get '/service/redis/:key' do

diff --git a/apps/app_spring_service/app_spring_service.war b/apps/app_spring_service/app_spring_service.war
diff --git a/apps/app_spring_service/src/main/java/org/cloudfoundry/canonical/apps/ServiceController.java b/apps/app_spring_service/src/main/java/org/cloudfoundry/canonical/apps/ServiceController.java
@@ -53,8 +53,11 @@ public void hello(HttpServletResponse response) throws IOException {
 	}
 
 	@RequestMapping(value = "/crash", method = RequestMethod.GET)
-	public String crash() throws Exception {
-		throw new Exception();
+	public void crash(HttpServletResponse response) throws IOException{
+		PrintWriter out = response.getWriter();
+//		Thread.currentThread().interrupt();
+		System.exit(0);
+		out.println("it should not get here");
 	}
 
 	@RequestMapping(value = "/service/mongo/{key}", method = RequestMethod.POST)

diff --git a/features/step_definitions/appcloud_steps.rb b/features/step_definitions/appcloud_steps.rb
@@ -502,8 +502,8 @@
 Then /^I should be able to access crash and it should crash$/ do
   contents = get_app_contents @app, 'crash'
   contents.should_not == nil
-  contents.body_str.should_not == nil
-  contents.response_code.should == 500
+  contents.response_code.should >= 500
+  contents.response_code.should < 600
   contents.close
 end