nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of github.com:diaspora/diaspora

Browse source
This commit is contained in:
Sarah Mei 2010-11-12 17:04:48 -06:00
commit 0467d7ad5e
1 changed files with 1 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
script/websocket_server.rb
View file

@ -43,8 +43,6 @@ end
begin
EM.run {
Diaspora::WebSocket.initialize_channels
EventMachine::WebSocket.start(
@ -74,7 +72,7 @@ begin
Diaspora::WebSocket.unsubscribe(user_id, sid) }
}
end
PID_FILE = APP_CONFIG[:socket_pidfile]
PID_FILE = APP_CONFIG[:socket_pidfile] ? APP_CONFIG[:socket_pidfile] : 'tmp/diaspora-ws.pid'
write_pidfile
puts "Websocket server started."
process_message