[ARVADOS] updated: 6ad9adc1224f1c45a652258d43b7b4b92898e2d1
git at public.curoverse.com
git at public.curoverse.com
Tue Oct 21 16:46:06 EDT 2014
Summary of changes:
services/api/script/crunch-dispatch.rb | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
via 6ad9adc1224f1c45a652258d43b7b4b92898e2d1 (commit)
via b25d2ec2950f6e2ffa9943a15c87441ebd6672b2 (commit)
via 0c6f7b227f95394fd4fffadfe7cfa022e32e5fae (commit)
from de79b73c55c5b1c469766ac8f930f335ac3fc246 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
commit 6ad9adc1224f1c45a652258d43b7b4b92898e2d1
Author: Tom Clegg <tom at curoverse.com>
Date: Tue Oct 21 16:36:13 2014 -0400
4266: Add word missing from comment.
diff --git a/services/api/script/crunch-dispatch.rb b/services/api/script/crunch-dispatch.rb
index a2bb65f..d314722 100755
--- a/services/api/script/crunch-dispatch.rb
+++ b/services/api/script/crunch-dispatch.rb
@@ -463,7 +463,7 @@ class Dispatcher
# crunch_log_throttle_bytes immediately. However, we'll
# leave [...] in bufend: if the trailing end of the long
# line does end up getting sent anywhere, it will have
- # some indication that it incomplete.
+ # some indication that it is incomplete.
bufend = "[...]"
else
# If line length is sane, we'll wait for the rest of the
commit b25d2ec2950f6e2ffa9943a15c87441ebd6672b2
Author: Tom Clegg <tom at curoverse.com>
Date: Tue Oct 21 16:35:41 2014 -0400
4266: Use each_line as enumerator instead of building an array with lines.each.
diff --git a/services/api/script/crunch-dispatch.rb b/services/api/script/crunch-dispatch.rb
index cce3f6c..a2bb65f 100755
--- a/services/api/script/crunch-dispatch.rb
+++ b/services/api/script/crunch-dispatch.rb
@@ -449,8 +449,8 @@ class Dispatcher
streambuf << buf
bufend = ''
- streambuf.lines("\n").each do |line|
- if not line.end_with? "\n"
+ streambuf.each_line do |line|
+ if not line.end_with? $/
if line.size > Rails.configuration.crunch_log_throttle_bytes
# Without a limit here, we'll use 2x an arbitrary amount
# of memory, and waste a lot of time copying strings
commit 0c6f7b227f95394fd4fffadfe7cfa022e32e5fae
Author: Tom Clegg <tom at curoverse.com>
Date: Tue Oct 21 16:34:53 2014 -0400
4266: Add missing "next" statement, oops.
diff --git a/services/api/script/crunch-dispatch.rb b/services/api/script/crunch-dispatch.rb
index 94311ed..cce3f6c 100755
--- a/services/api/script/crunch-dispatch.rb
+++ b/services/api/script/crunch-dispatch.rb
@@ -440,6 +440,7 @@ class Dispatcher
if not j[:log_throttle_is_open]
j[:log_throttle_bytes_skipped] += streambuf.size + buf.size
streambuf.replace ''
+ next
elsif buf == ''
next
end
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list