[ARVADOS] updated: ff3686b372cd598ee990acd990af2b04daf91ada

[git at public.curoverse.com]

Summary of changes:
 doc/api/methods/users.html.textile.liquid          |  4 ---
 sdk/cli/bin/arv                                    |  1 -
 .../app/controllers/arvados/v1/users_controller.rb | 37 ++--------------------
 services/api/config/routes.rb                      |  1 -
 4 files changed, 2 insertions(+), 41 deletions(-)

       via  ff3686b372cd598ee990acd990af2b04daf91ada (commit)
      from  b01252252e30851993c25817e07b574be66ce17f (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 ff3686b372cd598ee990acd990af2b04daf91ada
Author: radhika <radhika at curoverse.com>
Date:   Fri May 30 15:17:54 2014 -0400

    2895: remove users.event_stream api

diff --git a/doc/api/methods/users.html.textile.liquid b/doc/api/methods/users.html.textile.liquid
index 59fa856..33f884b 100644
--- a/doc/api/methods/users.html.textile.liquid
+++ b/doc/api/methods/users.html.textile.liquid
@@ -42,10 +42,6 @@ table(table table-bordered table-condensed).
 |_. Argument |_. Type |_. Description |_. Location |_. Example |
 {background:#ccffcc}.|uuid|string|The UUID of the User in question.|path||
 
-h2. event_stream
-
-event_stream users
-
 Arguments:
 
 table(table table-bordered table-condensed).
diff --git a/sdk/cli/bin/arv b/sdk/cli/bin/arv
index d047204..53956aa 100755
--- a/sdk/cli/bin/arv
+++ b/sdk/cli/bin/arv
@@ -313,7 +313,6 @@ end
 
 case api_method
 when
-  'arvados.users.event_stream',
   'arvados.jobs.log_stream',
   'arvados.jobs.log_tail_follow'
 
diff --git a/services/api/app/controllers/arvados/v1/users_controller.rb b/services/api/app/controllers/arvados/v1/users_controller.rb
index c2a32f0..781bd88 100644
--- a/services/api/app/controllers/arvados/v1/users_controller.rb
+++ b/services/api/app/controllers/arvados/v1/users_controller.rb
@@ -1,8 +1,8 @@
 class Arvados::V1::UsersController < ApplicationController
   skip_before_filter :find_object_by_uuid, only:
-    [:activate, :event_stream, :current, :system, :setup]
+    [:activate, :current, :system, :setup]
   skip_before_filter :render_404_if_no_object, only:
-    [:activate, :event_stream, :current, :system, :setup]
+    [:activate, :current, :system, :setup]
   before_filter :admin_required, only: [:setup, :unsetup]
 
   def current
@@ -14,39 +14,6 @@ class Arvados::V1::UsersController < ApplicationController
     show
   end
 
-  class ChannelStreamer
-    Q_UPDATE_INTERVAL = 12
-    def initialize(opts={})
-      @opts = opts
-    end
-    def each
-      return unless @opts[:channel]
-      @redis = Redis.new(:timeout => 0)
-      @redis.subscribe(@opts[:channel]) do |event|
-        event.message do |channel, msg|
-          yield msg + "\n"
-        end
-      end
-    end
-  end
-
-  def event_stream
-    channel = current_user.andand.uuid
-    if current_user.andand.is_admin
-      channel = params[:uuid] || channel
-    end
-    if client_accepts_plain_text_stream
-      self.response.headers['Last-Modified'] = Time.now.ctime.to_s
-      self.response_body = ChannelStreamer.new(channel: channel)
-    else
-      render json: {
-        href: url_for(uuid: channel),
-        comment: ('To retrieve the event stream as plain text, ' +
-                  'use a request header like "Accept: text/plain"')
-      }
-    end
-  end
-
   def activate
     if current_user.andand.is_admin && params[:uuid]
       @object = User.find params[:uuid]
diff --git a/services/api/config/routes.rb b/services/api/config/routes.rb
index 0223c04..49d78e4 100644
--- a/services/api/config/routes.rb
+++ b/services/api/config/routes.rb
@@ -49,7 +49,6 @@ Server::Application.routes.draw do
       resources :users do
         get 'current', on: :collection
         get 'system', on: :collection
-        get 'event_stream', on: :member
         post 'activate', on: :member
         post 'setup', on: :collection
         post 'unsetup', on: :member

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


hooks/post-receive
--