reverse some changes

This commit is contained in:
yqbk
2016-06-07 13:52:01 +02:00
parent d980ffb4c0
commit ed20a30517
2 changed files with 5 additions and 5 deletions

View File

@ -28,7 +28,7 @@ class DockerClient
path_to_delete = Pathname.new(local_workspace_path) path_to_delete = Pathname.new(local_workspace_path)
if local_workspace_path || Pathname.new(local_workspace_path).exist? if local_workspace_path || Pathname.new(local_workspace_path).exist?
path_to_delete.children.each{ |p| p.rmtree} path_to_delete.children.each{ |p| p.rmtree}
FileUtils.rmdir(path_to_delete) #FileUtils.rmdir(path_to_delete)
end end
end end
@ -70,13 +70,10 @@ class DockerClient
# todo separate stderr # todo separate stderr
query_params = 'logs=0&stream=1&' + (stderr ? 'stderr=1' : 'stdout=1&stdin=1') query_params = 'logs=0&stream=1&' + (stderr ? 'stderr=1' : 'stdout=1&stdin=1')
# Should be hosts instead of ws_hosts, right?
client_params = DockerClient.config['host'] + '/containers/' + @container.id + '/attach/ws?' + query_params
# Headers are required by Docker # Headers are required by Docker
headers = {'Origin' => 'http://localhost'} headers = {'Origin' => 'http://localhost'}
socket = Faye::WebSocket::Client.new(client_params, [], :headers => headers) socket = Faye::WebSocket::Client.new(DockerClient.config['ws_host'] + '/containers/' + @container.id + '/attach/ws?' + query_params, [], :headers => headers)
socket.on :error do |event| socket.on :error do |event|
Rails.logger.info "Websocket error: " + event.message Rails.logger.info "Websocket error: " + event.message

View File

@ -44,6 +44,8 @@ describe DockerContainerPool do
it 'takes a container from the pool' do it 'takes a container from the pool' do
expect(described_class).not_to receive(:create_container).with(@execution_environment) expect(described_class).not_to receive(:create_container).with(@execution_environment)
# #<Double (anonymous)> received unexpected message :json with (no args)
# expect(described_class).to receive(:json).with()
expect(described_class.get_container(@execution_environment)).to eq(container) expect(described_class.get_container(@execution_environment)).to eq(container)
end end
end end
@ -60,6 +62,7 @@ describe DockerContainerPool do
end end
end end
context 'when inactive' do context 'when inactive' do
before(:each) do before(:each) do
expect(described_class).to receive(:config).and_return(active: false) expect(described_class).to receive(:config).and_return(active: false)