[ARVADOS] updated: 1e0a693f16e599bb05a11933154da0f73030ecf7

[git at public.curoverse.com]

Summary of changes:
 apps/workbench/app/assets/javascripts/event_log.js | 4 ++--
 services/api/script/crunch-dispatch.rb             | 5 ++---
 2 files changed, 4 insertions(+), 5 deletions(-)

       via  1e0a693f16e599bb05a11933154da0f73030ecf7 (commit)
      from  e96a00962a6f5fcf65529630e4f2850fbfde2b73 (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 1e0a693f16e599bb05a11933154da0f73030ecf7
Author: radhika <radhika at curoverse.com>
Date:   Sat May 24 18:23:44 2014 -0400

    2756: log write

diff --git a/apps/workbench/app/assets/javascripts/event_log.js b/apps/workbench/app/assets/javascripts/event_log.js
index 5823a25..0ebb999 100644
--- a/apps/workbench/app/assets/javascripts/event_log.js
+++ b/apps/workbench/app/assets/javascripts/event_log.js
@@ -8,7 +8,7 @@ function subscribeToEventLog (elementId) {
   // if websockets are not supported by browser, do not subscribe for events
   websocketsSupported = ('WebSocket' in window);
   if (websocketsSupported == false) {
-    return;  
+    return;
   }
 
   // grab websocket connection from window, if one exists
@@ -39,7 +39,7 @@ function onEventLogDispatcherMessage(event) {
   parsedData = JSON.parse(event.data);
   object_uuid = parsedData.object_uuid;
 
-  // if there are any listeners for this object uuid or "all", trigger the event 
+  // if there are any listeners for this object uuid or "all", trigger the event
   matches = ".arv-log-event-listener[data-object-uuid=\"" + object_uuid + "\"],.arv-log-event-listener[data-object-uuids~=\"" + object_uuid + "\"],.arv-log-event-listener[data-object-uuid=\"all\"]";
   $(matches).trigger('arv-log-event', event.data);
 }
diff --git a/services/api/script/crunch-dispatch.rb b/services/api/script/crunch-dispatch.rb
index abed9dd..ad406ef 100755
--- a/services/api/script/crunch-dispatch.rb
+++ b/services/api/script/crunch-dispatch.rb
@@ -235,8 +235,7 @@ class Dispatcher
       end
 
       if stderr_buf
-        j[:stderr_buf] << stderr_buf
-        if stderr_buf.index "\n" || j[:stderr_flushed_at] != Time.now.to_i
+        if stderr_buf.index "\n"
         lines = stderr_buf.lines("\n").to_a
           lines.each do |line|
             $stderr.print "#{job_uuid} ! " unless line.index(job_uuid)
@@ -402,7 +401,7 @@ class Dispatcher
         running_job[:stderr_flushed_at] = Time.now.to_i
       end
     rescue
-      running_job[:stderr_buf] = 'Failed to write logs \n'
+      running_job[:stderr_buf] = "Failed to write logs \n"
       running_job[:stderr_flushed_at] = Time.now.to_i
     end
   end

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


hooks/post-receive
--