Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Loading…

Minor fixes (require in em-hiredis and class name in em-http) #37

Merged
merged 3 commits into from

2 participants

@jnak

Very minor bugs...

@igrigorik igrigorik merged commit 5b82a9f into igrigorik:master
@igrigorik
Owner

Thanks!

@jnak

Sorry Ilya, I kept commiting on my fork after my initial pull request.

My last commit jnak@3d28544 was not supposed to be merged in the master tree. Plus, I've found a workaround to use em-sync with blather without modifying em-sync.

Sorry about that,
Julien

@igrigorik
Owner

No problem - reverted. :)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Jul 4, 2011
  1. @jnak

    fixed class name in hiredis

    jnak authored
  2. @jnak

    fixed require in http

    jnak authored
  3. @jnak

    required patched for blather/dsl and mysql2/em_fiber and em-synchrony…

    jnak authored
    …/connection_pool to run together
This page is out of date. Refresh to see the latest.
View
12 lib/em-synchrony/connection_pool.rb
@@ -25,6 +25,18 @@ def execute(async)
release(f) if not async
end
end
+
+ # Patch for Blather XMPP DSL
+ #
+ # #Query being a mehod registered in the global namespace of Blather,
+ # it needs to be defined explicitly (vs in #method_missing) to be
+ # correctly called
+
+ def query(*args, &blk)
+ execute(false) do |conn|
+ conn.send(:query, *args, &blk)
+ end
+ end
private
View
2  lib/em-synchrony/em-hiredis.rb
@@ -6,7 +6,7 @@
module EventMachine
module Hiredis
- class Client
+ class Connection
attr_reader :connected
def self.connect(host = 'localhost', port = 6379)
View
2  lib/em-synchrony/em-http.rb
@@ -1,5 +1,5 @@
begin
- require "em-http"
+ require "em-http-request"
rescue LoadError => error
raise "Missing EM-Synchrony dependency: gem install em-http-request"
end
Something went wrong with that request. Please try again.