Merge branch 'broadcast-to-worker' of https://github.com/krainboltgreene/mastodon into krainboltgreene-broadcast-to-worker

This commit is contained in:
Eugen Rochko 2017-04-05 19:29:46 +02:00
commit d755ce96da
2 changed files with 23 additions and 10 deletions

View File

@ -34,12 +34,7 @@ class FeedManager
trim(timeline_type, account.id) trim(timeline_type, account.id)
end end
broadcast(account.id, event: 'update', payload: inline_render(account, 'api/v1/statuses/show', status)) PushUpdateWorker.perform_async(timeline_type, account.id, status.id)
end
def broadcast(timeline_id, options = {})
options[:queued_at] = (Time.now.to_f * 1000.0).to_i
redis.publish("timeline:#{timeline_id}", Oj.dump(options))
end end
def trim(type, account_id) def trim(type, account_id)
@ -81,10 +76,6 @@ class FeedManager
end end
end end
def inline_render(target_account, template, object)
Rabl::Renderer.new(template, object, view_path: 'app/views', format: :json, scope: InlineRablScope.new(target_account)).render
end
private private
def redis def redis

View File

@ -0,0 +1,22 @@
# frozen_string_literal: true
class PushUpdateWorker
include Sidekiq::Worker
def perform(timeline, account_id, status_id)
account = Account.find(account_id)
status = Status.find(status_id)
message = Rabl::Renderer.new(
'api/v1/statuses/show',
status,
view_path: 'app/views',
format: :json,
scope: InlineRablScope.new(account)
)
Redis.current.publish("timeline:#{account.id}", Oj.dump({ event: :update, payload: message, queued_at: (Time.now.to_f * 1000.0).to_i }))
rescue ActiveRecord::RecordNotFound
true
end
end