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

Allow \r\n and \n line breaks for Connection::Buffer

Browse Source 
* Nomad sends CRLF-separated lines
* AWS sends LF-separated lines
This commit is contained in:
Sebastian Serth
2022-04-24 18:26:05 +02:00
parent ad7db779a7
commit 35454836c8
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/runner/connection/buffer.rb
View File

@ -71,8 +71,8 @@ class Runner::Connection::Buffer
@buffering = false @buffering = false
@global_buffer = +'' @global_buffer = +''
# For our buffering, we identified line breaks with the `\n` and removed those temporarily. # For our buffering, we identified line breaks with the `\n` and removed those temporarily.
# Thus, we now re-add the `\n` at the end of the string and remove the `\r` at the same time. # Thus, we now re-add the `\n` at the end of the string and (optionally) remove a trailing `\r` at the same time.
message = message.gsub(/\r$/, "\n") message = message.gsub(/\r?$/, "\n")
@line_buffer.push message @line_buffer.push message
end end