Attempt to fix websocket bug, default pidfile location
This commit is contained in:
parent
9586ebb67e
commit
90474d9acb
1 changed files with 1 additions and 3 deletions
|
|
@ -43,8 +43,6 @@ end
|
||||||
|
|
||||||
begin
|
begin
|
||||||
EM.run {
|
EM.run {
|
||||||
|
|
||||||
|
|
||||||
Diaspora::WebSocket.initialize_channels
|
Diaspora::WebSocket.initialize_channels
|
||||||
|
|
||||||
EventMachine::WebSocket.start(
|
EventMachine::WebSocket.start(
|
||||||
|
|
@ -74,7 +72,7 @@ begin
|
||||||
Diaspora::WebSocket.unsubscribe(user_id, sid) }
|
Diaspora::WebSocket.unsubscribe(user_id, sid) }
|
||||||
}
|
}
|
||||||
end
|
end
|
||||||
PID_FILE = APP_CONFIG[:socket_pidfile]
|
PID_FILE = APP_CONFIG[:socket_pidfile] ? APP_CONFIG[:socket_pidfile] : 'tmp/diaspora-ws.pid'
|
||||||
write_pidfile
|
write_pidfile
|
||||||
puts "Websocket server started."
|
puts "Websocket server started."
|
||||||
process_message
|
process_message
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue