unicorn and such

wfarr · Jul 16, 2012 · abc6b70 · abc6b70
1 parent 2056ad0
commit abc6b70
Show file tree

Hide file tree

Showing 11 changed files with 11 additions and 10 deletions.
diff --git a/Gemfile b/Gemfile
@@ -12,7 +12,7 @@ gem 'sass',          '~>3.1'
 gem 'coffee-script'
 gem 'pusher'
 gem 'foreman'
-gem 'thin'
+gem 'unicorn'
 
 if RUBY_PLATFORM.downcase.include?("darwin")
   gem 'rubyosa19', :git => 'git://github.com/pbosetti/rubyosa.git'

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -14,8 +14,6 @@ GEM
       coffee-script-source
       execjs
     coffee-script-source (1.2.0)
-    daemons (1.1.6)
-    eventmachine (0.12.10)
     execjs (1.3.0)
       multi_json (~> 1.0)
     faraday (0.8.1)
@@ -28,6 +26,7 @@ GEM
     hashie (1.2.0)
     hike (1.2.1)
     json (1.7.3)
+    kgio (2.7.4)
     libxml-ruby (2.3.3)
     metaclass (0.0.1)
     mime-types (1.18)
@@ -54,6 +53,7 @@ GEM
       rack
     rack-test (0.6.1)
       rack (>= 1.0)
+    raindrops (0.10.0)
     rake (0.9.2.2)
     redis (2.2.2)
     rest-client (1.6.7)
@@ -79,12 +79,12 @@ GEM
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
     term-ansicolor (1.0.7)
-    thin (1.3.1)
-      daemons (>= 1.0.9)
-      eventmachine (>= 0.12.6)
-      rack (>= 1.0.0)
     thor (0.14.6)
     tilt (1.3.3)
+    unicorn (4.3.1)
+      kgio (~> 2.6)
+      rack
+      raindrops (~> 0.7)
     warden (1.2.1)
       rack (>= 1.0)
     warden-github (0.8.2)
@@ -116,5 +116,5 @@ DEPENDENCIES
   sinatra
   sinatra_auth_github (~> 0.8.2)
   sprockets
-  thin
+  unicorn
   yajl-ruby
diff --git a/Procfile b/Procfile
@@ -1,2 +1,2 @@
-web:      bundle exec thin start -p 5051
+web:      bundle exec unicorn -c config/unicorn.rb -p 5051
 realtime: script/realtime
diff --git a/config/unicorn.rb b/config/unicorn.rb
@@ -0,0 +1 @@
+worker_processes 5
diff --git a/script/realtime b/script/realtime
@@ -6,7 +6,7 @@
 
 $PROGRAM_NAME = 'play [realtime-daemon]'
 
-require_relative '../app/boot'
+require 'app/boot'
 
 class Realtime
   def initialize

diff --git a/vendor/cache/daemons-1.1.6.gem b/vendor/cache/daemons-1.1.6.gem
diff --git a/vendor/cache/eventmachine-0.12.10.gem b/vendor/cache/eventmachine-0.12.10.gem
diff --git a/vendor/cache/kgio-2.7.4.gem b/vendor/cache/kgio-2.7.4.gem
diff --git a/vendor/cache/raindrops-0.10.0.gem b/vendor/cache/raindrops-0.10.0.gem
diff --git a/vendor/cache/thin-1.3.1.gem b/vendor/cache/thin-1.3.1.gem
diff --git a/vendor/cache/unicorn-4.3.1.gem b/vendor/cache/unicorn-4.3.1.gem