Merge branch 'webpython-hybrid' of https://github.com/openHPI/codeocean into webpython-hybrid

2015-10-19 15:48:48 +02:00
parent 6151afcb55 0b9cda4f84
commit 6c5d5003d2
2 changed files with 22 additions and 13 deletions
--- a/app/controllers/submissions_controller.rb
+++ b/app/controllers/submissions_controller.rb
@@ -113,7 +113,7 @@ class SubmissionsController < ApplicationController
            parsed = JSON.parse(data)
            if parsed['cmd'] == 'exit'
              Rails.logger.info("Client killed container.")
-              @docker_client.kill_container(result[:container])
+              @docker_client.exit_container(result[:container])
            else
              socket.send data
            end