[ARVADOS] created: a65e4fe3126e8c8739fcf673a98d7a5924407f4f
Git user
git at public.curoverse.com
Thu Sep 22 15:04:11 EDT 2016
at a65e4fe3126e8c8739fcf673a98d7a5924407f4f (commit)
commit a65e4fe3126e8c8739fcf673a98d7a5924407f4f
Author: Tom Clegg <tom at curoverse.com>
Date: Thu Sep 22 15:04:08 2016 -0400
10120: Print lines to stderr even when per-time-interval throttle is closed.
diff --git a/services/api/lib/crunch_dispatch.rb b/services/api/lib/crunch_dispatch.rb
index ce94f73..cf67a90 100644
--- a/services/api/lib/crunch_dispatch.rb
+++ b/services/api/lib/crunch_dispatch.rb
@@ -585,12 +585,16 @@ class CrunchDispatch
break
end
end
+
+ unless line.index(job_uuid)
+ $stderr.print job_uuid, " ! "
+ end
+ $stderr.puts line
+
# rate_limit returns true or false as to whether to actually log
# the line or not. It also modifies "line" in place to replace
# it with an error if a logging limit is tripped.
if rate_limit j, line
- $stderr.print "#{job_uuid} ! " unless line.index(job_uuid)
- $stderr.puts line
pub_msg = "#{LogTime.now} #{line.strip}\n"
j[:stderr_buf_to_flush] << pub_msg
end
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list