htwkmooc/codeocean
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

some more logging (and cleanup)

Browse Source
This commit is contained in:
Ralf Teusner
2015-10-29 16:27:12 +01:00
parent b89bd9d521
commit ef60494911
3 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/controllers/submissions_controller.rb
View File

@ -112,13 +112,13 @@ class SubmissionsController < ApplicationController
end
tubesock.onmessage do |data|
Rails.logger.info("Client sending: " + data)
Rails.logger.debug("Client sending: " + data)
# Check wether the client send a JSON command and kill container
# if the command is 'exit', send it to docker otherwise.
begin
parsed = JSON.parse(data)
if parsed['cmd'] == 'exit'
Rails.logger.info("Client exited container.")
Rails.logger.debug("Client exited container.")
@docker_client.exit_container(result[:container])
else
socket.send data
@ -209,6 +209,7 @@ class SubmissionsController < ApplicationController
end
def stop
Rails.logger.debug('stopping submission ' + @submission)
container = Docker::Container.get(params[:container_id])
DockerClient.destroy_container(container)
rescue Docker::Error::NotFoundError