summaryrefslogtreecommitdiff
path: root/server.rb
diff options
context:
space:
mode:
authorPatrick Simianer <p@simianer.de>2015-12-14 12:41:16 +0100
committerPatrick Simianer <p@simianer.de>2015-12-14 12:41:16 +0100
commitc8bc64d31a3c345dcfa1a334652c490b8d5d2894 (patch)
tree9011617acef4352d32d958dc9c237a0c65ac38f5 /server.rb
parent400d0fa1d85775fc9747bf7fc92a1b671026a6cb (diff)
use thin
Diffstat (limited to 'server.rb')
-rwxr-xr-xserver.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/server.rb b/server.rb
index 48052ca..8f20162 100755
--- a/server.rb
+++ b/server.rb
@@ -6,7 +6,7 @@ require 'sinatra/reloader'
require 'nanomsg'
require 'zipf'
require 'json'
-require 'haml'
+require 'tilt/haml'
require 'uri'
require_relative './derivation_to_json/derivation_to_json'
require_relative './phrase2_extraction/phrase2_extraction'
@@ -46,6 +46,7 @@ $daemons = {
# #############################################################################
# Set-up Sinatra
# #############################################################################
+set :server, 'thin'
set :bind, SERVER_IP
set :port, WEB_PORT
set :allow_origin, :any