From 4de2ca995838c9f39fb4218df6480086d01d0b2f Mon Sep 17 00:00:00 2001 From: Raphael Sofaer Date: Thu, 21 Jul 2011 12:59:52 -0700 Subject: [PATCH] Get websocket pushing posts --- app/controllers/sockets_controller.rb | 9 ++++++--- app/helpers/sockets_helper.rb | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/app/controllers/sockets_controller.rb b/app/controllers/sockets_controller.rb index 5973db1cc..76f2701d3 100644 --- a/app/controllers/sockets_controller.rb +++ b/app/controllers/sockets_controller.rb @@ -7,8 +7,8 @@ class SocketsController < ApplicationController include SocketsHelper include Rails.application.routes.url_helpers helper_method :all_aspects - - + helper_method :current_user + def incoming(msg) Rails.logger.info("Socket received connection to: #{msg}") end @@ -33,11 +33,14 @@ class SocketsController < ApplicationController @user ||= ((@params[:user_or_id].instance_of? User )? @params[:user_or_id] : User.find(user_id)) end - helper_method :current_user def current_user user end + def url_options + {:host => "#{AppConfig[:pod_uri].host}:#{AppConfig[:pod_uri].port}"} + end + def all_aspects @all_aspects ||= user.aspects end diff --git a/app/helpers/sockets_helper.rb b/app/helpers/sockets_helper.rb index c0f44ff54..b80043679 100644 --- a/app/helpers/sockets_helper.rb +++ b/app/helpers/sockets_helper.rb @@ -56,7 +56,7 @@ module SocketsHelper raise "#{object.inspect} with class #{object.class} is not actionhashable." unless object.is_a? Retraction end 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 end action_hash = {:class =>object.class.to_s.underscore.pluralize, :html => v, :post_id => obj_id(object)}