From: radhika <radhika@curoverse.com>
Date: Tue, 27 May 2014 20:20:57 +0000 (-0400)
Subject: Merge branch '2756-eventbus-in-workbench' into 2678-owned_by
X-Git-Tag: 1.1.0~2604^2~1
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/319cc7b3862ff831798f92bcb2f0c921d208147d

Merge branch '2756-eventbus-in-workbench' into 2678-owned_by

Conflicts:
	services/api/script/crunch-dispatch.rb
---

319cc7b3862ff831798f92bcb2f0c921d208147d
diff --cc services/api/script/crunch-dispatch.rb
index 88ed689f44,c8d97d9376..a9b7598203
--- a/services/api/script/crunch-dispatch.rb
+++ b/services/api/script/crunch-dispatch.rb
@@@ -391,13 -397,13 +397,14 @@@ class Dispatche
  
    # send message to log table. we want these records to be transient
    def write_log running_job
-       if (running_job && running_job[:stderr_buf] != '')
+     begin
+       if (running_job && running_job[:stderr_buf_to_flush] != '')
          log = Log.new(object_uuid: running_job[:job].uuid,
                        event_type: 'stderr',
 +                      owner_uuid: running_job[:job].owner_uuid,
-                       properties: {"text" => running_job[:stderr_buf]})
+                       properties: {"text" => running_job[:stderr_buf_to_flush]})
          log.save!
-         running_job[:stderr_buf] = ''
+         running_job[:stderr_buf_to_flush] = ''
          running_job[:stderr_flushed_at] = Time.now.to_i
        end
      rescue