Get websocket pushing posts

This commit is contained in:
Raphael Sofaer 2011-07-21 12:59:52 -07:00
parent f3b7cf1391
commit 4de2ca9958
2 changed files with 7 additions and 4 deletions

View file

@ -7,7 +7,7 @@ class SocketsController < ApplicationController
include SocketsHelper include SocketsHelper
include Rails.application.routes.url_helpers include Rails.application.routes.url_helpers
helper_method :all_aspects helper_method :all_aspects
helper_method :current_user
def incoming(msg) def incoming(msg)
Rails.logger.info("Socket received connection to: #{msg}") Rails.logger.info("Socket received connection to: #{msg}")
@ -33,11 +33,14 @@ class SocketsController < ApplicationController
@user ||= ((@params[:user_or_id].instance_of? User )? @params[:user_or_id] : User.find(user_id)) @user ||= ((@params[:user_or_id].instance_of? User )? @params[:user_or_id] : User.find(user_id))
end end
helper_method :current_user
def current_user def current_user
user user
end end
def url_options
{:host => "#{AppConfig[:pod_uri].host}:#{AppConfig[:pod_uri].port}"}
end
def all_aspects def all_aspects
@all_aspects ||= user.aspects @all_aspects ||= user.aspects
end end

View file

@ -56,7 +56,7 @@ module SocketsHelper
raise "#{object.inspect} with class #{object.class} is not actionhashable." unless object.is_a? Retraction raise "#{object.inspect} with class #{object.class} is not actionhashable." unless object.is_a? Retraction
end end
rescue Exception => e rescue Exception => e
Rails.logger.error(:event => :socket_render, :status => :fail, :user => user.diaspora_handle, :object=> object.id, :object_class => object.class) Rails.logger.error(:event => :socket_render, :status => :fail, :user => user.diaspora_handle, :object=> object.id, :object_class => object.class, :error_message => e.message)
raise e raise e
end end
action_hash = {:class =>object.class.to_s.underscore.pluralize, :html => v, :post_id => obj_id(object)} action_hash = {:class =>object.class.to_s.underscore.pluralize, :html => v, :post_id => obj_id(object)}