Permalink
Browse files

update to use em_mysql2 driver from em-synchrony

  • Loading branch information...
igrigorik committed Aug 27, 2011
1 parent 3a554bd commit fb4c5384ec5e4513698a60f11e0e9613d5f65ad0
Showing with 32 additions and 31 deletions.
  1. +2 −1 Gemfile
  2. +28 −27 Gemfile.lock
  3. +2 −3 README.md
View
@@ -15,7 +15,8 @@ gem 'eventmachine', :git => 'git://github.com/eventmachine/eventmachine.git'
gem 'rack-fiber_pool', :require => 'rack/fiber_pool'
gem 'em-synchrony', :git => 'git://github.com/igrigorik/em-synchrony.git', :require => [
'em-synchrony',
- 'em-synchrony/em-http'
+ 'em-synchrony/em-http',
+ 'em-synchrony/activerecord'
]
# async activerecord requires
View
@@ -1,12 +1,12 @@
GIT
remote: git://github.com/eventmachine/eventmachine.git
- revision: 38705c4418b6af33455cdfd8b6184d9cccded0fc
+ revision: 5222bcd4fc3eccbf19212cd007c6f9bb42122538
specs:
- eventmachine (1.0.0.beta.3)
+ eventmachine (1.0.0.beta.4)
GIT
remote: git://github.com/igrigorik/em-http-request.git
- revision: c7848ff95a603c0d97b465ed1f2058178b3f78c0
+ revision: 9172f3a270097372014a47be0dad1a513b9d9460
specs:
em-http-request (1.0.0.beta.4)
addressable (>= 2.2.3)
@@ -16,7 +16,7 @@ GIT
GIT
remote: git://github.com/igrigorik/em-synchrony.git
- revision: 5c2aa0ec22509102a1e2fda659c1d2cea5cb6d5e
+ revision: 54194c00c65b7cfb94dfb74a41e01829ebb57e55
specs:
em-synchrony (0.3.0.beta.1)
eventmachine (>= 1.0.0.beta.1)
@@ -55,23 +55,23 @@ GEM
activesupport (3.1.0.rc4)
multi_json (~> 1.0)
addressable (2.2.6)
- arel (2.1.1)
+ arel (2.1.4)
bcrypt-ruby (2.1.4)
builder (3.0.0)
coffee-script (2.2.0)
coffee-script-source
execjs
- coffee-script-source (1.1.1)
+ coffee-script-source (1.1.2)
daemons (1.1.4)
em-socksify (0.1.0)
eventmachine
erubis (2.7.0)
- execjs (1.2.0)
+ execjs (1.2.4)
multi_json (~> 1.0)
- hike (1.1.0)
- http_parser.rb (0.5.1)
+ hike (1.2.1)
+ http_parser.rb (0.5.2)
i18n (0.6.0)
- jquery-rails (1.0.11)
+ jquery-rails (1.0.13)
railties (~> 3.0)
thor (~> 0.14)
mail (2.3.0)
@@ -80,17 +80,17 @@ GEM
treetop (~> 1.4.8)
mime-types (1.16)
multi_json (1.0.3)
- mysql2 (0.3.6)
- polyglot (0.3.1)
- rack (1.3.0)
+ mysql2 (0.3.7)
+ polyglot (0.3.2)
+ rack (1.3.2)
rack-cache (1.0.2)
rack (>= 0.4)
- rack-fiber_pool (0.9.1)
- rack-mount (0.8.1)
+ rack-fiber_pool (0.9.2)
+ rack-mount (0.8.2)
rack (>= 1.0.0)
rack-ssl (1.3.2)
rack
- rack-test (0.6.0)
+ rack-test (0.6.1)
rack (>= 1.0)
rails (3.1.0.rc4)
actionmailer (= 3.1.0.rc4)
@@ -108,30 +108,31 @@ GEM
rdoc (~> 3.4)
thor (~> 0.14.6)
rake (0.9.2)
- rdoc (3.6.1)
- sass (3.1.2)
- sass-rails (3.1.0.rc.2)
+ rdoc (3.9.4)
+ sass (3.1.7)
+ sass-rails (3.1.0.rc.5)
actionpack (~> 3.1.0.rc1)
railties (~> 3.1.0.rc1)
- sass (>= 3.1.2)
+ sass (>= 3.1.4)
sprockets (>= 2.0.0.beta.9)
sinatra (1.2.6)
rack (~> 1.1)
- tilt (>= 1.2.2, < 2.0)
- sprockets (2.0.0.beta.10)
- hike (~> 1.0)
+ tilt (< 2.0, >= 1.2.2)
+ sprockets (2.0.0.beta.15)
+ hike (~> 1.2)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
thin (1.2.11)
daemons (>= 1.0.9)
eventmachine (>= 0.12.6)
rack (>= 1.0.0)
thor (0.14.6)
- tilt (1.3.2)
- treetop (1.4.9)
+ tilt (1.3.3)
+ treetop (1.4.10)
+ polyglot
polyglot (>= 0.3.1)
- tzinfo (0.3.28)
- uglifier (0.5.4)
+ tzinfo (0.3.29)
+ uglifier (1.0.1)
execjs (>= 0.3.0)
multi_json (>= 1.0.2)
View
@@ -8,7 +8,7 @@ Simple async demo stack with Rails 3 + EventMachine and Fibers.
Howto / example commits:
- * [Convert ActiveRecord to use async mysql driver](http://github.com/igrigorik/async-rails/commit/72ea38433246cc58cd31e3863f4ed4e0c861ad28)
+ * Configure ActiveRecord to use async mysql driver: [Gemfile](https://github.com/igrigorik/async-rails/blob/master/Gemfile#L16), and [database.yml](https://github.com/igrigorik/async-rails/blob/master/config/database.yml#L4)
* [Use async HTTP fetching within Rails](http://github.com/igrigorik/async-rails/commit/6307f3f416f21a40304d2f4a07509b923051744b)
* [Mount async Sinatra app](http://github.com/igrigorik/async-rails/commit/50c5e4fd6701dfa2b3ecfc697ca53b40f8c57827)
@@ -29,7 +29,7 @@ Environment setup:
Starting up Rails:
* bundle install
- * thin -D start
+ * bundle exec thin -D start
## Concurrency
@@ -67,7 +67,6 @@ Pushing the stack on my MBP (db pool = 250; fiber pool = 250; env = production;
For full AB trace see [this gist](http://gist.github.com/503627)
-
Resources:
* [No callbacks, No threads - RailsConf 2010 Presentation](http://www.slideshare.net/igrigorik/no-callbacks-no-threads-railsconf-2010)

0 comments on commit fb4c538

Please sign in to comment.