Commit 558b9a25 authored by Paul Asmuth's avatar Paul Asmuth
Browse files

proper backend initialization

parent c746bddf
Loading
Loading
Loading
Loading
+12 −4
Original line number Diff line number Diff line
@@ -2,7 +2,9 @@ class FnordQuery::Acceptor

  def initialize(opts)
    @opts = opts
  end

  def execute(runner, backend)
    inbound_class = if @opts[:protocol] == :udp
      FnordQuery::UDPAcceptor
    else
@@ -14,11 +16,17 @@ class FnordQuery::Acceptor
      @opts[:port] || 2323
    ]

    @opts.merge!(
      :runner => runner,
      :backend => backend
    )

    begin
      inbound_stream = inbound_class.start(@opts)
      FnordQuery.log "listening on #{@opts[:protocol]}://#{@opts[:listen][0..1].join(":")}"
    rescue
      FnordQuery.log "cant start #{inbound_class.name}. port in use?"
      puts "listening on #{@opts[:protocol]}://#{@opts[:listen][0..1].join(":")}"
    #rescue
    #  puts "error: cant start #{inbound_class.name}. port in use?"
    #  exit!(1)
    end
  end

+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ class FnordQuery::TCPAcceptor < EventMachine::Connection
  end

  def post_init
    @backend = @opts[:backend_klass].new(@opts[:backend_options])
    @backend = @@opts[:backend][0].new(@@opts[:backend][1])
    @events_buffered = 0
    @streaming = true
    @buffer = ""
+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ class FnordQuery::UDPAcceptor < EventMachine::Connection
  end

  def backend
    @backend ||= @opts[:backend_klass].new(@opts[:backend_options])
    @backend ||= @opts[:backend][0].new(@opts[:backend][1])
  end

  def events
+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ class FnordQuery::RedisBackend
  end

  def subscribe(query, &block)

    puts "subscribe: #{query.inspect}"
  end

  def on_finish(&block)
+2 −2
Original line number Diff line number Diff line
@@ -21,8 +21,8 @@ class FnordQuery::Query
    end
  end

  def execute(runner, backend)
    puts backend.inspect
  def execute(runner, _backend)
    backend = _backend[0].new(_backend[1])
    backend.on_finish do
      runner.send(:shutdown, true)
    end
Loading