diff --git a/app/controllers/submissions_controller.rb b/app/controllers/submissions_controller.rb index 66b7f6b6..fed8e067 100644 --- a/app/controllers/submissions_controller.rb +++ b/app/controllers/submissions_controller.rb @@ -278,19 +278,24 @@ class SubmissionsController < ApplicationController for part in message.split("\n") self.parse_message(part,output_stream,socket, container, false) end - elsif message.include? '' + elsif @buffering and message.include?('/>') @buffer += message parsed = {'cmd'=>'write','stream'=>output_stream,'data'=>@buffer} socket.send_data JSON.dump(parsed) #socket.send_data @buffer @buffering = false #Rails.logger.info('Sent complete buffer') + elsif @buffering and message.end_with?("}\r") + @buffer += message + socket.send_data @buffer + @buffering = false + #Rails.logger.info('Sent complete buffer') elsif @buffering @buffer += message #Rails.logger.info('Appending to buffer')