changes in gemfile

lib/docker_client.rb

@@ -69,10 +69,13 @@ class DockerClient
     # todo separate stderr
     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 = {'Origin' => 'http://localhost'}
 
-    socket = Faye::WebSocket::Client.new(DockerClient.config['ws_host'] + '/containers/' + @container.id + '/attach/ws?' + query_params, [], :headers => headers)
+    socket = Faye::WebSocket::Client.new(client_params, [], :headers => headers)
 
     socket.on :error do |event|
       Rails.logger.info "Websocket error: " + event.message

lib/xikolo/client.rb

@@ -1,4 +1,4 @@
-class Xikolo::Client
+class Xikolo::3Client
   def self.get_user(user_id)
     params = {:user_id => user_id}
     response = get_request(user_profile_url(user_id), params)