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

set encoding utf-8 for stdout and stderr from docker

Browse Source
This commit is contained in:
Ralf Teusner
2015-11-08 23:55:45 +01:00
parent 32ad4129c4
commit 0fd20c479b
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/docker_client.rb
View File

@ -303,7 +303,7 @@ class DockerClient
output = container.exec(['bash', '-c', command]) output = container.exec(['bash', '-c', command])
Rails.logger.info "output from container.exec" Rails.logger.info "output from container.exec"
Rails.logger.info output Rails.logger.info output
result = {status: output[2] == 0 ? :ok : :failed, stdout: output[0].join, stderr: output[1].join} result = {status: output[2] == 0 ? :ok : :failed, stdout: output[0].join.force_encoding('utf-8'), stderr: output[1].join.force_encoding('utf-8')}
end end
# if we use pooling and recylce the containers, put it back. otherwise, destroy it. # if we use pooling and recylce the containers, put it back. otherwise, destroy it.
(DockerContainerPool.config[:active] && RECYCLE_CONTAINERS) ? self.class.return_container(container, @execution_environment) : self.class.destroy_container(container) (DockerContainerPool.config[:active] && RECYCLE_CONTAINERS) ? self.class.return_container(container, @execution_environment) : self.class.destroy_container(container)