From 511a4487de43e8e56b4d871d9508a605b7cbf866 Mon Sep 17 00:00:00 2001 From: Raphael Date: Fri, 17 Sep 2010 10:44:15 -0700 Subject: [PATCH] Make running the websocket server a little easier --- script/server | 5 +++++ script/websocket_server.rb | 9 ++++++++- 2 files changed, 13 insertions(+), 1 deletion(-) create mode 100755 script/server diff --git a/script/server b/script/server new file mode 100755 index 000000000..0094482b1 --- /dev/null +++ b/script/server @@ -0,0 +1,5 @@ +#!/bin/bash + +mkdir -p -v log/thin/ +bundle exec ruby ./script/websocket_server.rb& +bundle exec thin start $@ diff --git a/script/websocket_server.rb b/script/websocket_server.rb index 7dee8d35c..2fbc1370a 100644 --- a/script/websocket_server.rb +++ b/script/websocket_server.rb @@ -19,6 +19,7 @@ def process_message end +begin EM.run { Diaspora::WebSocket.initialize_channels @@ -35,7 +36,13 @@ end ws.onclose { Diaspora::WebSocket.unsubscribe(ws.request['Path'].gsub('/',''), sid) } } end + puts "Websocket server started." process_message } - +rescue RuntimeError => e + raise e unless e.message.include?("no acceptor") + puts "Are you sure the websocket server isn't already running?" + puts "Just start thin with bundle exec thin start." + Process.exit +end