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

Sending command 'client_kill' on stop button click now.

Browse Source 
Killing a container only if command client_kill was send.
Moved propmpt to prompt.js
This commit is contained in:
Alexander Kastius
2016-09-09 16:41:20 +02:00
parent 2b621e2de6
commit 3fd43fdee2
6 changed files with 61 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/controllers/submissions_controller.rb
View File

@ -139,12 +139,12 @@ class SubmissionsController < ApplicationController
tubesock.onmessage do |data|
Rails.logger.info(Time.now.getutc.to_s + ": Client sending: " + data)
# Check whether the client send a JSON command and kill container
# if the command is 'exit', send it to docker otherwise.
# if the command is 'client_exit', send it to docker otherwise.
begin
parsed = JSON.parse(data)
if parsed['cmd'] == 'exit'
if parsed['cmd'] == 'client_kill'
Rails.logger.debug("Client exited container.")
@docker_client.exit_container(result[:container])
@docker_client.kill_container(result[:container])
else
socket.send data
Rails.logger.debug('Sent the received client data to docker:' + data)