Enable proxy/adapter plugins to be configured in the catalog.

lib/droonga/catalog.rb

@@ -50,6 +50,10 @@ def initialize
       end
     end
 
+    def option(name)
+      @catalog["options"][name]
+    end
+
     def get_engines(name)
       device = @catalog["farms"][name]["device"]
       pattern = Regexp.new("^#{name}\.")

lib/droonga/engine.rb

@@ -22,13 +22,11 @@
 require "droonga/server"
 require "droonga/worker"
 require "droonga/executor"
-require "droonga/adapter"
 
 module Droonga
   class Engine
     DEFAULT_OPTIONS = {
       :queue_name => "DroongaQueue",
-      :handlers   => ["proxy"],
       :n_workers  => 1,
       :with_server  => false
     }
@@ -53,10 +51,6 @@ def start
         start_emitter
       else
         @executor = Executor.new(@options)
-        if @options[:proxy]
-          @executor.add_handler("proxy_message")
-          @executor.add_handler("adapter")
-        end
       end
     end
 

lib/droonga/executor.rb

@@ -22,7 +22,6 @@
 require "droonga/job_queue"
 require "droonga/handler_plugin"
 require "droonga/plugin"
-require "droonga/catalog"
 require "droonga/proxy"
 
 module Droonga
@@ -32,11 +31,12 @@ class Executor
     def initialize(options={})
       @handlers = []
       @outputs = {}
+      @options = options
       @name = options[:name]
       @database_name = options[:database] || "droonga/db"
       @queue_name = options[:queue_name] || "DroongaQueue"
       Droonga::JobQueue.ensure_schema(@database_name, @queue_name)
-      @handler_names = options[:handlers] || ["proxy"]
+      @handler_names = options[:handlers]
       @pool_size = options[:n_workers]
 #     load_handlers
       Droonga::Plugin.load_all
@@ -217,6 +217,7 @@ def prepare
       @handler_names.each do |handler_name|
         add_handler(handler_name)
       end
+      add_handler("proxy_message") if @options[:proxy]
     end
 
     def find_handler(command)

lib/droonga/proxy.rb

@@ -17,6 +17,8 @@
 
 require 'tsort'
 require "droonga/handler"
+require "droonga/adapter"
+require "droonga/catalog"
 
 module Droonga
   class Proxy
@@ -34,6 +36,10 @@ def initialize(worker, name)
       @collectors = {}
       @current_id = 0
       @local = Regexp.new("^#{@name}")
+      plugins = ["proxy", "adapter"] + (Droonga::catalog.option("plugins")||[])
+      plugins.each do |plugin|
+        @worker.add_handler(plugin)
+      end
     end
 
     def shutdown
@@ -257,6 +263,10 @@ def initialize(id, proxy, components, tasks, inputs)
 
       def handle(name, value)
         tasks = @inputs[name]
+        unless tasks
+          #TODO: result arrived before its query
+          return
+        end
         tasks.each do |task|
           task["n_of_inputs"] += 1 if name
           component = task["component"]

lib/droonga/server.rb

@@ -66,10 +66,6 @@ def initialize
       super
       @message_input = config[:message_input]
       @executor = Executor.new(config)
-      if config[:proxy]
-        @executor.add_handler("proxy_message")
-        @executor.add_handler("adapter")
-      end
     end
 
     def before_run

lib/droonga/worker.rb

@@ -22,7 +22,7 @@ module Worker
     attr_reader :context, :envelope, :name
 
     def initialize
-      @executor = Executor.new(config)
+      @executor = Executor.new(config.merge(:proxy => false))
     end
 
     def run