[ARVADOS] updated: 60998a3875f79482533976e6e0ee0f99a9589c46

[git at public.curoverse.com]

Summary of changes:
 services/api/config/application.default.yml |  26 +++--
 services/api/script/crunch-dispatch.rb      | 158 ++++++++++++++++++----------
 2 files changed, 123 insertions(+), 61 deletions(-)

       via  60998a3875f79482533976e6e0ee0f99a9589c46 (commit)
       via  89e7c751bc5eb9ac467f607c9e172e44c1690f4c (commit)
       via  2fcc6fabb45befcc2ee4fe237744d6e3df5c4e39 (commit)
       via  9378424698db0e02856d09586333cac9142331b2 (commit)
       via  bd99df2e6c5f7bb0b75c7fa2f1a9c1c2defeca8a (commit)
       via  e910d13fc5fc63a86f20be3b758c08db3d429bc6 (commit)
       via  3ff644b461b69c38418384e532e3741a07333daf (commit)
       via  54a951255316417a42a3bd8c77aaa0b58d180440 (commit)
      from  62790d76daf181a457d8f47741721967cd9cb7d9 (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 60998a3875f79482533976e6e0ee0f99a9589c46
Merge: 62790d7 89e7c75
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Thu Oct 2 16:33:16 2014 -0400

    Merge branch '3769-throttle-logs' closes #3769


commit 89e7c751bc5eb9ac467f607c9e172e44c1690f4c
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Thu Oct 2 16:32:02 2014 -0400

    3769: Spelling fix and remove debugging puts.

diff --git a/services/api/config/application.default.yml b/services/api/config/application.default.yml
index 15bafa9..b85df8c 100644
--- a/services/api/config/application.default.yml
+++ b/services/api/config/application.default.yml
@@ -81,8 +81,8 @@ common:
   crunch_limit_log_events_per_job: 65536
 
   # These two settings control how frequently log events are flushed to the
-  # database.  Logs lines are buffered until either crunch_log_bytes_per_event
-  # has been reached or crunch_log_seconds_between_events has ellapsed since
+  # database.  Log lines are buffered until either crunch_log_bytes_per_event
+  # has been reached or crunch_log_seconds_between_events has elapsed since
   # the last flush.
   crunch_log_bytes_per_event: 4096
   crunch_log_seconds_between_events: 1
diff --git a/services/api/script/crunch-dispatch.rb b/services/api/script/crunch-dispatch.rb
index 66afec6..bb20aef 100755
--- a/services/api/script/crunch-dispatch.rb
+++ b/services/api/script/crunch-dispatch.rb
@@ -364,8 +364,6 @@ class Dispatcher
     now = Time.now
     throttle_period = Rails.configuration.crunch_log_throttle_period
 
-    #puts "Handle line at #{now - running_job[:log_throttle_timestamp]}, buf bytes #{line.size}, so far #{running_job[:log_throttle_bytes_so_far]}, throttled #{running_job[:log_throttle_bytes_skipped]}"
-
     if running_job[:log_throttle_bytes_skipped] > 0
       # We've skipped some log in the current time period already, so continue to
       # skip the log

-----------------------------------------------------------------------


hooks/post-receive
--