Skip to content
Extraits de code Groupes Projets
Valider 4de2ca99 rédigé par Raphael Sofaer's avatar Raphael Sofaer
Parcourir les fichiers

Get websocket pushing posts

parent f3b7cf13
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
...@@ -7,8 +7,8 @@ class SocketsController < ApplicationController ...@@ -7,8 +7,8 @@ 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}")
end end
...@@ -33,11 +33,14 @@ class SocketsController < ApplicationController ...@@ -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
......
...@@ -56,7 +56,7 @@ module SocketsHelper ...@@ -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)}
......
0% Chargement en cours ou .
You are about to add 0 people to the discussion. Proceed with caution.
Terminez d'abord l'édition de ce message.
Veuillez vous inscrire ou vous pour commenter