ruby-redis 0.0.1 → 0.0.2

data/README

@@ -1,11 +1,11 @@
 This project was started because I needed an authenticating and routable
-proxy for Redis.  The main feature is a high-performance, evented, pure-Ruby,
-implementation of the complete Redis wire protocol with the same interface as
+proxy for Redis.  The main feature is a high performance, eventable, pure Ruby,
+implementation of the complete Redis wire protocol using the same interface as
 hiredis/reader.
 
 In the worst possible scenario of very small payloads, I was benching 30k GETs
 per second with pure ruby and 40k/s with hiredis/reader.  With larger payloads,
-the performance gap narrows to zero.  Not near-zero, actual zero.
+the performance gap narrows to zero.
 
 Ruby Gem:
 
@@ -24,9 +24,9 @@ Client example:
 
 require 'redis'
 EventMachine.run {
-  redis = EventMachine.connect '127.0.0.1', 6379, Redis
+  redis = EventMachine.connect '127.0.0.1', 6379, Redis::Client
   # Subscribe and publish messages will call here
-  redis.pubsub_callback do |message|
+  redis.on_pubsub do |message|
     # case message[0]
     # when 'psubscribe' ...
   end
@@ -57,23 +57,24 @@ Fibers; compatible with em-synchrony:
 
 require 'redis/synchrony'
 Redis.synchrony {
-  # Use redis to pipeline and sync to block
-  redis = EventMachine.connect '127.0.0.1', 6379, Redis, :hiredis => true
+  # Be sure to pipeline commands when you can
+  redis = EventMachine.connect '127.0.0.1', 6379, Redis::Client
+  # synchronized requests will return result or raise exception
   sync = redis.synchrony
   # repeat transaction until success
-  reply = nil
+  reply = check = nil
   until reply
-    redis.watch 'mykey' # never fails, use pipeline
+    redis.watch 'mykey'
     x = sync.get('mykey').to_i
-    reply = sync.multi_exec do |multi|
-      # multi is pipelined (async)
-      # no reason to block in here
-      multi.set 'mykey', x + 1
-    end
+    redis.multi
+    redis.set 'mykey', x + 1
+    redis.badcmd
+    redis.get('mykey') {|result| check=result}
+    reply = sync.exec
   end
   redis.close
-  p reply
   EM.stop
+  p reply, check # ["OK", #<RuntimeError>, "4"], "4"
 }
 
 

data/lib/redis.rb

@@ -1,215 +1,13 @@
-# for Ruby older than 1.9
-unless Kernel.respond_to?(:require_relative)
-  module Kernel
-    def require_relative(path)
-      require File.join(File.dirname(caller[0]), path.to_str)
-    end
-  end
+%w{redis/version redis/client}.each do |file|
+  require File.expand_path file, File.dirname(__FILE__)
 end
 
-require 'eventmachine'
-class Redis < EventMachine::Connection ; end
-
-require_relative 'redis/version'
-require_relative 'redis/reader'
-require_relative 'redis/sender'
-
-class Redis
-  
-  include Sender
-  
-  class Command
-    include EventMachine::Deferrable
-    def initialize connection
-      @connection = connection
-      self.errback do |msg|
-        # game over on timeout
-        @connection.close_connection unless msg
-      end
-    end
-    # EventMachine older than 1.0.0.beta.4 doesn't return self
-    test = self.new nil
-    unless self === test.callback{}
-      def callback; super; self; end
-      def errback; super; self; end
-      def timeout *args; super; self; end
-    end
-  end
-  
-  def initialize options={}
-    if defined? Hiredis and defined? Hiredis::Reader
-      @reader = Hiredis::Reader.new
-    else
-      @reader = Reader.new
-    end
-    @queue = []
-    @pubsub_callback = proc{}
-  end
-  
-  def unbind
-    @queue.each { |d| d.fail RuntimeError.new 'connection closed' }
-    @queue.clear
-  end
-  
-  # Pub/Sub works by sending all orphaned messages to this callback.
-  # It is simple and fast but not tolerant to programming errors.
-  # Subclass Redis and/or create a defensive layer if you need to.
-  def pubsub_callback &block
-    @pubsub_callback = block
-  end
-  
-  def receive_data data
-    @reader.feed data
-    until (data = @reader.gets) == false
-      deferrable = @queue.shift
-      if deferrable
-        if Exception === data
-          deferrable.fail data
-        else
-          deferrable.succeed data
-        end
-      else
-        @pubsub_callback.call data
-      end
-    end
-  rescue Exception => e
-    @queue.shift.fail e unless @queue.empty?
-    close_connection
-  end
-  
-  def method_missing method, *args, &block
-    deferrable = Command.new self
-    if [:subscribe, :psubscribe, :unsubscribe, :punsubscribe].include? method
-      deferrable.callback do |data|
-        deferrable.succeed nil
-        @pubsub_callback.call data
-      end
-    end
-    if transform = self.class.transforms[method]
-      deferrable.callback do |data|
-        begin
-          deferrable.succeed transform.call data
-        rescue Exception => e
-          deferrable.fail e
-        end
-      end
-    end
-    deferrable.callback &block if block
-    @queue.push deferrable
-    send_redis args.reduce([method]){ |arr, arg|
-      if Hash === arg
-        arr += arg.to_a.flatten 1
-      else
-        arr << arg
-      end
-    }
-    deferrable
-  end
-  
-  # Yielded by multi_exec to proxy and collect commands
-  class Multi < Command
-    include Enumerable
-    def initialize *args
-      super
-      @commands = []
-    end
-    def each
-      @commands.each {|x|yield x}
-    end
-    def size
-      @commands.size
-    end
-    def method_missing method, *args, &block
-      command = @connection.send method, *args, &block
-      proxy = Command.new @connection
-      command.callback do |status|
-        @commands << proxy
-      end
-      command.errback do |err|
-        @commands << err
-        proxy.fail err
-      end
-      proxy
-    end
-  end
-  
-  # Wrap around multi and exec.  Leaves the raw calls
-  # to multi and exec open for custom implementations.
-  def multi_exec
-    self.multi.errback do |r|
-      # This usually happens in the case of a programming error.
-      # Sometimes it is called when the connection breaks.
-      self.close_connection
-    end
-    error = nil
-    begin
-      yield redis_multi = Multi.new(self)
-    rescue Exception => e
-      error = e
-    end
-    redis_exec = self.exec
-    if error
-      EM.next_tick { redis_exec.fail error }
-    end
-    redis_exec.callback do |results|
-      # Normalized results include syntax errors and original references.
-      # Command callbacks are meant to run before exec callbacks.
-      if results == nil
-        redis_exec.succeed nil
-      else
-        normalized_results = []
-        redis_multi.each do |command|
-          if Exception === command
-            normalized_results << command
-          else
-            result = results.shift
-            normalized_results << result
-            if Exception === result
-              command.fail result
-            else
-              command.succeed result
-            end
-          end
-        end
-        redis_exec.succeed normalized_results
-      end
-    end
-  end
+module Redis
   
-  # Some data is best transformed into a Ruby type.  You can set up global
-  # transforms here that are automatically attached to command callbacks.
-  #   Redis.transforms[:mycustom1] = Redis.transforms[:exists] # boolean
-  #   Redis.transforms[:mycustom2] = proc { |data| MyType.new data }
-  def self.transforms
-    @@transforms ||= lambda {
-      boolean = lambda { |tf| tf[0] == 1 ? true : false }
-      hash = lambda { |hash| Hash[*hash] }
-      {
-        #keys
-        :exists => boolean,
-        :expire => boolean,
-        :expireat => boolean,
-        :move => boolean,
-        :persist => boolean,
-        :renamenx => boolean,
-        #strings
-        :msetnx => boolean,
-        :setnx => boolean,
-        #hashes
-        :hexists => boolean,
-        :hgetall => hash,
-        :hset => boolean,
-        :hsetnx => boolean,
-        #sets
-        :sismember => boolean,
-        :smove => boolean,
-        :srem => boolean,
-        #zsets
-        :zrem => boolean,
-      }
-    }.call
-  end
+  # This space intentionally blank
 
+  # Server entry in redis/bin.rb
+  # Client entry in redis/client.rb
   
 end
 

data/lib/redis/bin.rb

@@ -1,13 +1,45 @@
-require File.expand_path '../redis', File.dirname(__FILE__)
-require_relative 'config'
-require_relative 'connection'
-require_relative 'logger'
+%w{reader sender version config logger strict connection protocol database 
+   server keys strings lists sets zsets hashes pubsub}.each do |file|
+     require File.expand_path file, File.dirname(__FILE__)
+end
 
-class Redis
+module Redis
   class Bin
 
-    class StrictConnection < Connection
+    class RubyRedisServer < EventMachine::Connection
+
       include Strict
+      include Connection
+      include Protocol
+      include Sender
+      
+      def initialize logger, databases, config={}
+        @logger = logger
+        @databases = databases
+        @database = databases[0]
+        @config = config
+        super
+      end
+      
+      def post_init
+        authorized nil
+        set_comm_inactivity_timeout @config[:timeout]
+      end
+      
+      def authorized password
+        return true if @authorized
+        return false unless @config[:requirepass] == password
+        extend Server
+        extend Keys
+        extend Strings
+        extend Lists
+        extend Sets
+        extend ZSets
+        extend Hashes
+        extend PubSub
+        @authorized = true
+      end
+      
     end
     
     def self.server
@@ -28,44 +60,62 @@ class Redis
       config = Config.new(ARGV.empty? ? [] : ARGF)
 
       Dir.chdir config[:dir]
+      
+      if config[:logfile] == 'stdout'
+        logger = Logger.new STDOUT
+      else
+        logger = Logger.new config[:logfile] 
+      end
 
-      Redis.logger config[:logfile] unless config[:logfile] == 'stdout'
-
-      #TODO
-      # Set server verbosity to 'debug'
-      # it can be one of:
-      # debug (a lot of information, useful for development/testing)
-      # verbose (many rarely useful info, but not a mess like the debug level)
-      # notice (moderately verbose, what you want in production probably)
-      # warning (only very important / critical messages are logged)
-      # loglevel verbose
+      if config[:loglevel] == 'debug'
+        logger.level = Logger::DEBUG
+      elsif config[:loglevel] == 'notice'
+        logger.level = Logger::NOTICE
+      elsif config[:loglevel] == 'warning'
+        logger.level = Logger::WARNING
+      elsif config[:loglevel] != 'verbose'
+        raise "Invalid log level. Must be one of debug, notice, warning, verbose."
+      else
+        logger.level = Logger::INFO
+      end
 
       if show_no_config_warning
-        Redis.logger.warn "Warning: no config file specified, using the default config. In order to specify a config file use 'ruby-redis /path/to/redis.conf'"
+        logger.warn "Warning: no config file specified, using the default config. In order to specify a config file use 'ruby-redis /path/to/redis.conf'"
       end
-
-      EventMachine.epoll
-      EventMachine.run {
-  
-        (0...config[:databases]).each do |db_index|
-          Redis.databases[db_index] ||= Database.new
+      
+      if config[:daemonize]
+        exit!(0) if fork
+        Process::setsid
+        exit!(0) if fork
+        STDIN.reopen("/dev/null")
+        STDOUT.reopen("/dev/null", "w")
+        STDERR.reopen("/dev/null", "w")
+        begin
+          File.open(config[:pidfile], 'w') do |io|
+            io.write "%d\n" % Process.pid
+          end
+        rescue Exception => e
+          logger.error e.message
         end
+      end
+      
+      EventMachine.run {
 
-        #TODO support changing host and EventMachine::start_unix_domain_server
-        EventMachine::start_server "127.0.0.1", config[:port], StrictConnection, config[:requirepass]
-
-        if config[:daemonize]
-          raise 'todo'
-          # daemonize();
-          # FILE *fp = fopen(server.pidfile,"w");
-          # if (fp) { fprintf(fp,"%d\n",(int)getpid()); fclose(fp); }
+        databases = Array.new(config[:databases]) {Database.new}
+        started_message = "Server started, Ruby Redis version %s" % Redis::VERSION
+  
+        if config[:unixsocket]
+          EventMachine::start_server config[:unixsocket], RubyRedisServer, logger, databases, config
+          logger.notice started_message
+          logger.notice "The server is now ready to accept connections at %s" % config[:unixsocket]
+        else
+          EventMachine::start_server config[:bind], config[:port], RubyRedisServer, logger, databases, config
+          logger.notice started_message
+          logger.notice "The server is now ready to accept connections on port %d" % config[:port]
         end
         
-        Redis.logger.notice "Server started, Ruby Redis version %s" % Redis::VERSION
-        Redis.logger.notice "The server is now ready to accept connections on port %d" % config[:port]
-
         # The test suite blocks until it gets the pid from the log.
-        Redis.logger.flush
+        logger.flush
 
       }
       

data/lib/redis/bin.rbc

@@ -1,6 +1,6 @@
 !RBIX
-6235178746665710376
-x
+8948944263761558646
+18
 M
 1
 n
@@ -9,90 +9,99 @@ x
 10
 __script__
 i
-81
-5
-45
+88
+7
 0
+64
+7
 1
+64
 7
 2
 64
-45
-0
+7
 3
-65
-49
+64
+7
 4
-0
-49
+64
+7
 5
-1
-49
+64
+7
 6
-2
-47
-49
+64
 7
-1
-15
-5
+7
+64
 7
 8
 64
-47
-49
+7
 9
-1
-15
-5
+64
 7
 10
 64
-47
-49
-9
-1
-15
-5
 7
 11
 64
-47
-49
-9
-1
+7
+12
+64
+7
+13
+64
+7
+14
+64
+7
+15
+64
+7
+16
+64
+35
+17
+56
+17
+50
+18
+0
 15
 99
 7
-12
+19
 1
 65
 49
-13
+20
 3
 13
 99
 12
 7
-14
+21
 12
 7
-15
+22
 12
 65
 12
 49
-16
+23
 4
 15
 49
-14
+21
 0
 15
 2
 11
 I
-6
+11
+I
+0
 I
 0
 I
@@ -101,14 +110,117 @@ I
 0
 n
 p
-17
+24
+s
+6
+reader
+s
+6
+sender
+s
+7
+version
+s
+6
+config
+s
+6
+logger
+s
+6
+strict
+s
+10
+connection
+s
+8
+protocol
+s
+8
+database
+s
+6
+server
+s
+4
+keys
+s
+7
+strings
+s
+5
+lists
+s
+4
+sets
+s
+5
+zsets
+s
+6
+hashes
+s
+6
+pubsub
+M
+1
+p
+2
+x
+9
+for_block
+t
+n
+x
+9
+__block__
+i
+28
+57
+19
+0
+15
+5
+45
+0
+1
+20
+0
+45
+0
+2
+65
+49
+3
+0
+49
+4
+1
+49
+5
+2
+47
+49
+6
+1
+11
+I
+7
+I
+1
+I
+1
+I
+0
+I
+1
+n
+p
+7
 x
 4
 File
 n
-s
-8
-../redis
 n
 x
 11
@@ -122,18 +234,33 @@ expand_path
 x
 7
 require
-s
-6
-config
+p
+7
+I
+0
+I
+1
+I
+1
+I
+2
+I
+4
+I
+3
+I
+1c
 x
-16
-require_relative
-s
-10
-connection
-s
-6
-logger
+49
+/Users/dturnbull/ruby/ruby-redis/lib/redis/bin.rb
+p
+1
+x
+4
+file
+x
+4
+each
 x
 5
 Redis
@@ -189,6 +316,8 @@ I
 0
 I
 0
+I
+0
 n
 p
 5
@@ -209,7 +338,7 @@ x
 3
 Bin
 i
-42
+44
 5
 66
 99
@@ -218,38 +347,40 @@ i
 45
 1
 2
+43
+3
 65
 49
-3
+4
 3
 13
 99
 12
 7
-4
+5
 12
 7
-5
+6
 12
 65
 12
 49
-6
+7
 4
 15
 49
-4
+5
 0
 15
 99
 7
-7
-7
 8
+7
+9
 65
 5
 49
-6
+7
 4
 11
 I
@@ -260,16 +391,21 @@ I
 0
 I
 0
+I
+0
 n
 p
-9
+10
 x
-16
-StrictConnection
+15
+RubyRedisServer
+x
+12
+EventMachine
+n
 x
 10
 Connection
-n
 x
 10
 open_class
@@ -281,10 +417,10 @@ M
 n
 n
 x
-16
-StrictConnection
+15
+RubyRedisServer
 i
-11
+80
 5
 66
 5
@@ -295,9 +431,80 @@ i
 49
 2
 1
+15
+5
+45
+3
+4
+47
+49
+2
+1
+15
+5
+45
+5
+6
+47
+49
+2
+1
+15
+5
+45
+7
+8
+47
+49
+2
+1
+15
+99
+7
+9
+7
+10
+65
+67
+49
+11
+0
+49
+12
+4
+15
+99
+7
+13
+7
+14
+65
+67
+49
+11
+0
+49
+12
+4
+15
+99
+7
+15
+7
+16
+65
+67
+49
+11
+0
+49
+12
+4
 11
 I
-2
+5
+I
+0
 I
 0
 I
@@ -306,7 +513,7 @@ I
 0
 n
 p
-3
+17
 x
 6
 Strict
@@ -314,423 +521,1518 @@ n
 x
 7
 include
-p
+x
+10
+Connection
+n
+x
+8
+Protocol
+n
+x
+6
+Sender
+n
+x
+10
+initialize
+M
+1
+n
+n
+x
+10
+initialize
+i
+28
+23
+1
+10
+14
+44
+43
+0
+78
+49
+1
+1
+19
+1
+15
+20
+0
+38
+2
+15
+20
+1
+38
 3
+15
+54
+89
+4
+11
+I
+4
 I
 2
 I
-a
+1
 I
-b
+0
+I
+2
+n
+p
+5
+x
+4
+Hash
+x
+16
+new_from_literal
+x
+10
+@databases
+x
+7
+@config
+x
+10
+initialize
+p
+9
+I
+-1
+I
+10
+I
+e
+I
+11
+I
+13
+I
+12
+I
+18
+I
+13
+I
+1c
 x
 49
 /Users/dturnbull/ruby/ruby-redis/lib/redis/bin.rb
 p
-0
+2
 x
-13
-attach_method
+9
+databases
 x
 6
-server
+config
+x
+17
+method_visibility
+x
+15
+add_defn_method
+x
+9
+post_init
 M
 1
 n
 n
 x
-6
-server
+9
+post_init
 i
-258
+33
 45
 0
 1
-7
+49
 2
-64
-35
-1
-83
-3
-13
-10
-24
-15
-45
 0
-4
-7
-5
-64
-35
-1
-83
+78
+49
 3
-9
-51
+1
+38
+4
+15
 5
-7
-6
-64
-45
-7
-8
-43
-9
-49
-10
 1
 47
 49
-11
+5
 1
 15
 5
-78
-47
+39
+6
+7
+7
 49
-12
+3
 1
+47
+49
 8
-52
-1
-15
-45
-0
-13
-7
-14
-64
-35
 1
-83
+11
+I
 3
-13
-10
-76
-15
-45
+I
 0
-15
-49
-16
+I
 0
-79
-85
-17
-9
-106
-45
+I
+0
+I
+0
+n
+p
+9
+x
+5
+Redis
+n
+x
+9
+databases
+x
+2
+[]
+x
+9
+@database
+x
+10
+authorized
+x
+7
+@config
+x
+7
+timeout
+x
+27
+set_comm_inactivity_timeout
+p
+9
+I
+-1
+I
+16
+I
+0
+I
+17
+I
+d
+I
 18
+I
+14
+I
 19
-7
-20
-64
+I
+21
+x
 49
+/Users/dturnbull/ruby/ruby-redis/lib/redis/bin.rb
+p
+0
+x
+10
+authorized
+M
+1
+n
+n
+x
+10
+authorized
+i
+105
+39
+0
+9
+8
+2
 11
+8
+9
 1
 15
-45
-18
-21
+39
+1
 7
-22
-64
+2
 49
-11
+3
 1
+20
+0
+83
+4
+9
+26
+1
+8
+28
+3
+11
 15
 5
-79
+45
+5
+6
 47
 49
-12
+7
 1
+15
+5
+45
 8
-107
+9
+47
+49
+7
 1
 15
+5
 45
-0
-23
+10
+11
+47
 49
-16
-0
-78
-83
-3
-19
-0
+7
+1
 15
+5
 45
-24
-25
+12
 13
-71
-26
-47
-9
-156
 47
 49
-27
-0
-13
-45
-0
-28
-49
-29
-0
-9
-146
-35
-0
-8
-149
+7
+1
+15
+5
 45
-30
-31
+14
+15
 47
 49
-32
+7
 1
 15
-8
-174
-45
-0
-33
-49
-29
-0
-9
-168
-35
-0
-8
-171
+5
 45
-30
-34
+16
+17
+47
 49
-26
+7
 1
+15
+5
+45
+18
 19
+47
+49
+7
 1
 15
+5
 45
-35
-36
 20
-1
-7
-37
-49
-38
-1
+21
+47
 49
-39
+7
 1
 15
-20
-1
-7
-40
-49
+2
 38
-1
-7
-41
-64
-83
+0
+11
+I
 3
-9
-208
+I
 1
-8
-221
-45
-7
-42
-20
+I
 1
-7
-40
-49
-38
+I
+0
+I
 1
-49
-43
+n
+p
+22
+x
+11
+@authorized
+x
+7
+@config
+x
+11
+requirepass
+x
+2
+[]
+x
+2
+==
+x
+6
+Server
+n
+x
+6
+extend
+x
+4
+Keys
+n
+x
+7
+Strings
+n
+x
+5
+Lists
+n
+x
+4
+Sets
+n
+x
+5
+ZSets
+n
+x
+6
+Hashes
+n
+x
+6
+PubSub
+n
+p
+29
+I
+-1
+I
+1c
+I
+0
+I
+1d
+I
+9
+I
+0
+I
+a
+I
+1e
+I
+1c
+I
+0
+I
+1d
+I
+1f
+I
+26
+I
+20
+I
+2f
+I
+21
+I
+38
+I
+22
+I
+41
+I
+23
+I
+4a
+I
+24
+I
+53
+I
+25
+I
+5c
+I
+26
+I
+65
+I
+27
+I
+69
+x
+49
+/Users/dturnbull/ruby/ruby-redis/lib/redis/bin.rb
+p
+1
+x
+8
+password
+p
+15
+I
+2
+I
+b
+I
+b
+I
+c
+I
+14
+I
+d
+I
+1d
+I
+e
+I
+26
+I
+10
+I
+34
+I
+16
+I
+42
+I
+1c
+I
+50
+x
+49
+/Users/dturnbull/ruby/ruby-redis/lib/redis/bin.rb
+p
+0
+x
+13
+attach_method
+x
+6
+server
+M
+1
+n
+n
+x
+6
+server
+i
+581
+45
+0
+1
+7
+2
+64
+35
+1
+83
+3
+13
+10
+24
+15
+45
+0
+4
+7
+5
+64
+35
+1
+83
+3
+9
+51
+5
+7
+6
+64
+45
+7
+8
+43
+9
+49
+10
+1
+47
+49
+11
+1
+15
+5
+78
+47
+49
+12
+1
+8
+52
+1
+15
+45
+0
+13
+7
+14
+64
+35
+1
+83
+3
+13
+10
+76
+15
+45
+0
+15
+49
+16
+0
+79
+85
+17
+9
+106
+45
+18
+19
+7
+20
+64
+49
+11
+1
+15
+45
+18
+21
+7
+22
+64
+49
+11
+1
+15
+5
+79
+47
+49
+12
+1
+8
+107
+1
+15
+45
+0
+23
+49
+16
+0
+78
+83
+3
+19
+0
+15
+45
+24
+25
+13
+71
+26
+47
+9
+156
+47
+49
+27
+0
+13
+45
+0
+28
+49
+29
+0
+9
+146
+35
+0
+8
+149
+45
+30
+31
+47
+49
+32
+1
+15
+8
+174
+45
+0
+33
+49
+29
+0
+9
+168
+35
+0
+8
+171
+45
+30
+34
+49
+26
+1
+19
+1
+15
+20
+1
+7
+35
+49
+36
+1
+7
+37
+64
+83
+3
+9
+211
+45
+7
+38
+49
+39
+0
+45
+40
+41
+43
+42
+13
+18
+2
+49
+43
+1
+15
+8
+327
+20
+1
+7
+35
+49
+36
+1
+7
+44
+64
+83
+3
+9
+245
+45
+7
+45
+49
+39
+0
+45
+40
+46
+43
+47
+13
+18
+2
+49
+43
+1
+15
+8
+327
+20
+1
+7
+35
+49
+36
+1
+7
+48
+64
+83
+3
+9
+279
+45
+7
+49
+49
+39
+0
+45
+40
+50
+43
+51
+13
+18
+2
+49
+43
+1
+15
+8
+327
+20
+1
+7
+35
+49
+36
+1
+7
+52
+64
+83
+3
+10
+296
+2
+8
+297
+3
+9
+309
+5
+7
+53
+64
+47
+49
+54
+1
+8
+327
+45
+7
+55
+49
+39
+0
+45
+40
+56
+43
+57
+13
+18
+2
+49
+43
+1
+15
+15
+45
+58
+59
+20
+1
+7
+60
+49
+36
+1
+49
+61
+1
+15
+20
+1
+7
+62
+49
+36
+1
+7
+63
+64
+83
+3
+9
+359
+1
+8
+372
+45
+7
+64
+20
+1
+7
+62
+49
+36
+1
+49
+39
+1
+15
+20
+0
+9
+391
+45
+7
+65
+49
+39
+0
+7
+66
+64
+49
+67
+1
+8
+392
+1
+15
+45
+68
+69
+20
+1
+7
+70
+49
+36
+1
+56
+71
+50
+26
+1
+19
+2
+15
+20
+1
+7
+72
+49
+36
+1
+9
+570
+5
+48
+73
+9
+433
+5
+78
+47
+49
+74
+1
+8
+434
+1
+15
+45
+75
+76
+49
+77
+0
+15
+5
+48
+73
+9
+455
+5
+78
+47
+49
+74
+1
+8
+456
+1
+15
+45
+78
+79
+7
+80
+64
+49
+81
+1
+15
+45
+82
+83
+7
+80
+64
+7
+84
+64
+49
+81
+2
+15
+45
+18
+85
+7
+80
+64
+7
+84
+64
+49
+81
+2
+15
+26
+93
+0
+15
+29
+521
+0
+45
+86
+87
+20
+1
+7
+88
+49
+36
+1
+7
+84
+64
+56
+89
+50
+90
+2
+30
+8
+565
+26
+93
+1
+15
+24
+13
+45
+91
+92
+12
+49
+93
+1
+10
+538
+8
+560
+15
+24
+19
+3
+15
+45
+7
+94
+49
+39
+0
+20
+3
+49
+95
+0
+49
+96
+1
+25
+8
+565
+15
+92
+1
+27
+34
+92
+0
+27
+8
+571
+1
+15
+45
+97
+98
+56
+99
+50
+100
+0
+11
+I
+a
+I
+4
+I
+0
+I
+0
+I
+0
+n
+p
+101
+x
+4
+ARGV
+n
+s
+2
+-v
+x
+2
+==
+n
+s
+9
+--version
+s
+31
+Redis server version %s (Ruby)
+
+x
+5
+Redis
+n
+x
+7
+VERSION
+x
+1
+%
+x
+5
+print
+x
+4
+exit
+n
+s
+6
+--help
+n
+x
+4
+size
+x
+1
+>
+x
+6
+STDERR
+n
+s
+40
+Usage: ruby-redis [/path/to/redis.conf]
+
+n
+s
+45
+       ruby-redis - (read config from stdin)
+
+n
+x
+6
+Config
+n
+x
+3
+new
+x
+8
+allocate
+n
+x
+6
+empty?
+x
+4
+ARGF
+n
+x
+10
+initialize
+n
+n
+x
+8
+loglevel
+x
+2
+[]
+s
+5
+debug
+n
+x
+6
+logger
+x
+6
+Logger
+n
+x
+5
+DEBUG
+x
+6
+level=
+s
+6
+notice
+n
+n
+x
+6
+NOTICE
+s
+7
+warning
+n
+n
+x
+7
+WARNING
+s
+7
+verbose
+s
+66
+Invalid log level. Must be one of debug, notice, warning, verbose.
+x
+5
+raise
+n
+n
+x
+4
+INFO
+x
+3
+Dir
+n
+x
+3
+dir
+x
+5
+chdir
+x
+7
+logfile
+s
+6
+stdout
+n
+n
+s
+131
+Warning: no config file specified, using the default config. In order to specify a config file use 'ruby-redis /path/to/redis.conf'
+x
+4
+warn
+x
+5
+Array
+n
+x
+9
+databases
+M
 1
-15
-20
-0
+p
+2
+x
 9
-240
+for_block
+t
+n
+x
+6
+server
+i
+25
 45
-7
-44
-49
-43
 0
-7
-45
-64
-49
-46
-1
-8
-241
 1
-15
-45
+13
+71
+2
+47
+9
+21
 47
-48
 49
+3
+0
+13
+47
 49
+4
 0
 15
-45
-47
-50
-56
-51
-50
-52
+8
+24
+49
+2
 0
 11
 I
-5
+3
 I
-2
+0
 I
 0
 I
 0
-n
+I
+0
+I
+-2
 p
-53
+5
 x
-4
-ARGV
+8
+Database
 n
-s
-2
--v
 x
-2
-==
-n
-s
+3
+new
+x
+8
+allocate
+x
+10
+initialize
+p
+3
+I
+0
+I
+51
+I
+19
+x
+49
+/Users/dturnbull/ruby/ruby-redis/lib/redis/bin.rb
+p
+0
+x
 9
---version
-s
-31
-Redis server version %s (Ruby)
-
+daemonize
+x
+4
+fork
 x
 5
-Redis
-n
+exit!
 x
 7
-VERSION
+Process
+n
 x
-1
-%
+6
+setsid
 x
 5
-print
-x
-4
-exit
+STDIN
 n
 s
-6
---help
-n
-x
-4
-size
+9
+/dev/null
 x
-1
->
+6
+reopen
 x
 6
-STDERR
-n
-s
-40
-Usage: ruby-redis [/path/to/redis.conf]
-
+STDOUT
 n
 s
-45
-       ruby-redis - (read config from stdin)
-
+1
+w
 n
 x
-6
-Config
+4
+File
 n
 x
-3
-new
+7
+pidfile
+M
+1
+p
+2
 x
-8
-allocate
+9
+for_block
+t
 n
 x
 6
-empty?
-x
+server
+i
+22
+57
+19
+0
+15
+20
+0
+7
+0
+64
+45
+1
+2
+49
+3
+0
+49
 4
-ARGF
+1
+49
+5
+1
+11
+I
+5
+I
+1
+I
+1
+I
+0
+I
+1
 n
+p
+6
+s
+3
+%d
+
 x
-10
-initialize
-n
+7
+Process
 n
 x
 3
-Dir
-n
+pid
 x
-3
-dir
+1
+%
+x
+5
+write
+p
+5
+I
+0
+I
+5e
+I
+4
+I
+5f
+I
+16
+x
+49
+/Users/dturnbull/ruby/ruby-redis/lib/redis/bin.rb
+p
+1
 x
 2
-[]
+io
 x
-5
-chdir
+4
+open
 x
-7
-logfile
-s
-6
-stdout
+9
+Exception
 n
 x
-6
-logger
+3
+===
 n
-s
-131
-Warning: no config file specified, using the default config. In order to specify a config file use 'ruby-redis /path/to/redis.conf'
 x
-4
-warn
+7
+message
+x
+5
+error
 x
 12
 EventMachine
 n
-x
-5
-epoll
-n
 M
 1
 p
@@ -744,341 +2046,234 @@ x
 6
 server
 i
-128
-44
+163
+7
+0
+64
+45
+1
+2
 43
+3
+49
+4
+1
+19
 0
-78
+15
 21
 1
 1
 7
-1
+5
 49
-2
+6
 1
-2
-49
-3
-3
-56
-4
-50
-5
-0
-15
+9
+85
 45
-6
-7
 7
 8
-64
 21
 1
 1
 7
-9
+5
 49
-2
+6
 1
 45
+9
 10
-11
 21
 1
-1
-7
-12
-49
 2
-1
-49
-13
-4
-15
 21
 1
 1
-7
-14
-49
-2
-1
-9
-71
-5
-7
-15
-64
-47
 49
-16
-1
-8
-72
-1
+11
+4
 15
 45
-17
-18
+1
+12
 49
-19
+13
 0
-7
 20
-64
-45
-17
-21
-43
-22
-49
-23
-1
+0
 49
-24
+14
 1
 15
 45
-17
-25
+1
+15
 49
-19
+13
 0
 7
-26
+16
 64
 21
 1
 1
 7
-9
+5
 49
-2
+6
 1
 49
-23
+4
 1
 49
-24
+14
 1
-15
+8
+152
 45
+7
 17
-27
+21
+1
+1
+7
+18
 49
+6
+1
+21
+1
+1
+7
 19
-0
 49
-28
-0
-11
-I
-7
-I
-0
-I
-0
-I
-0
-I
--2
-p
-29
-x
-5
-Range
-x
+6
+1
+45
 9
-databases
-x
-2
-[]
-x
-3
-new
-M
+20
+21
 1
-p
 2
-x
-9
-for_block
-t
-n
-x
-6
-server
-i
-59
-57
-19
-0
+21
+1
+1
+49
+11
+5
 15
 45
-0
 1
+21
 49
-2
+13
 0
 20
 0
-14
-2
 49
-3
+14
 1
-13
-10
-54
 15
 45
-4
-5
+1
+22
+49
 13
-71
+0
+7
+23
+64
+21
+1
+1
+7
+19
+49
 6
-47
-9
-42
-47
+1
 49
-7
-0
-13
-47
+4
+1
 49
-8
-0
+14
+1
 15
-8
 45
+1
+24
 49
-6
-0
 13
-18
-3
+0
 49
-9
-2
-15
-8
-58
-18
-2
-16
-2
+25
+0
 11
 I
-6
-I
-1
-I
-1
-I
-1
-n
-p
-10
-x
-5
-Redis
-n
-x
-9
-databases
-x
-2
-[]
-x
-8
-Database
-n
-x
-3
-new
-x
 8
-allocate
-x
-10
-initialize
-x
-3
-[]=
-p
-5
 I
-0
+1
 I
-32
+0
 I
-4
+0
 I
-33
+0
 I
-3b
-x
-49
-/Users/dturnbull/ruby/ruby-redis/lib/redis/bin.rb
+-2
 p
+26
+s
+37
+Server started, Ruby Redis version %s
+x
+5
+Redis
+n
+x
+7
+VERSION
+x
 1
+%
 x
-8
-db_index
+10
+unixsocket
 x
-4
-each
+2
+[]
 x
 12
 EventMachine
 n
-s
-9
-127.0.0.1
-x
-4
-port
 x
-16
-StrictConnection
+15
+RubyRedisServer
 n
 x
-11
-requirepass
-x
 12
 start_server
-x
-9
-daemonize
-s
-4
-todo
-x
-5
-raise
-x
-5
-Redis
 n
 x
 6
 logger
+x
+6
+notice
+n
 s
-37
-Server started, Ruby Redis version %s
+51
+The server is now ready to accept connections at %s
 n
 x
-7
-VERSION
-x
-1
-%
+4
+bind
 x
-6
-notice
+4
+port
+n
+n
 n
 s
 56
@@ -1088,75 +2283,82 @@ x
 5
 flush
 p
-19
+21
 I
 0
 I
-32
+68
 I
-16
+e
 I
-37
+6a
 I
-33
+18
 I
-39
+6b
 I
-3d
+30
 I
-3a
+6c
 I
-47
+3c
 I
-39
+6d
 I
-48
+55
 I
-0
+6f
 I
-49
+75
 I
-40
+70
 I
-5e
+81
 I
-41
+71
 I
-76
+98
 I
-44
+0
 I
-80
+99
+I
+75
+I
+a3
 x
 49
 /Users/dturnbull/ruby/ruby-redis/lib/redis/bin.rb
 p
-0
+1
+x
+15
+started_message
 x
 3
 run
 p
-55
+111
 I
 -1
 I
-d
+2c
 I
 0
 I
-f
+2e
 I
 1a
 I
-10
+2f
 I
 2b
 I
-11
+30
 I
 33
 I
-f
+2e
 I
 34
 I
@@ -1164,23 +2366,23 @@ I
 I
 35
 I
-14
+33
 I
 4e
 I
-15
+34
 I
 58
 I
-16
+35
 I
 62
 I
-17
+36
 I
 6a
 I
-14
+33
 I
 6b
 I
@@ -1188,11 +2390,11 @@ I
 I
 6c
 I
-1a
+39
 I
 78
 I
-1c
+3b
 I
 95
 I
@@ -1200,7 +2402,7 @@ I
 I
 9c
 I
-1c
+3b
 I
 ab
 I
@@ -1208,56 +2410,174 @@ I
 I
 ae
 I
-1c
+3b
 I
 b1
 I
-1e
+3d
 I
 bf
 I
-20
+3e
+I
+d3
+I
+3f
+I
+e1
+I
+40
+I
+f5
+I
+41
+I
+103
+I
+42
+I
+117
+I
+43
+I
+12b
+I
+44
 I
-dd
+135
+I
+46
+I
+147
 I
 0
 I
-de
+148
 I
-2b
+49
+I
+156
 I
-e2
+4b
 I
-2c
+174
+I
+0
 I
-f0
+175
 I
-2b
+4d
+I
+179
+I
+4e
+I
+187
 I
-f1
+4d
+I
+188
 I
 0
 I
-f2
+189
 I
-2f
+51
 I
-f9
+19b
 I
-30
+56
+I
+1a4
+I
+57
+I
+1b2
+I
+0
+I
+1b3
+I
+58
+I
+1ba
+I
+59
+I
+1c8
+I
+0
+I
+1c9
+I
+5a
+I
+1d3
+I
+5b
+I
+1e0
+I
+5c
+I
+1ed
+I
+5e
+I
+209
+I
+0
+I
+20e
+I
+61
+I
+21b
+I
+63
+I
+21c
+I
+61
+I
+21f
+I
+62
+I
+235
+I
+0
+I
+23a
+I
+56
+I
+23b
 I
-102
+0
+I
+23c
+I
+66
+I
+245
 x
 49
 /Users/dturnbull/ruby/ruby-redis/lib/redis/bin.rb
 p
-2
+4
 x
 22
 show_no_config_warning
 x
 6
 config
+x
+9
+databases
+x
+1
+e
 p
 5
 I
@@ -1265,11 +2585,11 @@ I
 I
 9
 I
-1f
+21
 I
-d
+2c
 I
-2a
+2c
 x
 49
 /Users/dturnbull/ruby/ruby-redis/lib/redis/bin.rb
@@ -1295,29 +2615,25 @@ x
 13
 attach_method
 p
-11
+9
 I
 0
 I
 1
 I
-19
+1b
 I
 2
 I
-22
-I
-3
-I
-2b
+35
 I
-4
+1
 I
-34
+3b
 I
 6
 I
-51
+58
 x
 49
 /Users/dturnbull/ruby/ruby-redis/lib/redis/bin.rb