lib/larva/daemon.rb in larva-0.6.4 vs lib/larva/daemon.rb in larva-0.7.0

@@ -11,52 +11,18 @@
     #   :env - Defaults to development
     #   :meducation_sdk_secret_key - Defauls to looking in config file
     def initialize(processors, options = {})
       @processors = processors
       @options = options
-      @config_dir = options.fetch(:config_dir) {raise LarvaError.new("Please provide :config_dir via options")}
-      @logfile = options.fetch(:logfile) {raise LarvaError.new("Please provide :logfile via options")}
-      @env = options[:env] || "development"
     end
 
     def start
       Filum.logger.info "Starting Workerpool"
       Larva::WorkerPool.start(@processors)
       Filum.logger.info "Workerpool Finished"
     end
 
     def configure
-      Filum.setup(@logfile)
-      Filum.logger.info "Configuring Daemon"
-
-      if meducation_sdk_config = parse_config_file('meducation-sdk.yml')
-        MeducationSDK.config do |config|
-          config.access_id  = meducation_sdk_config[:access_id]
-          config.secret_key = @options[:meducation_sdk_secret_key] || meducation_sdk_config[:secret_key]
-          config.logger     = Filum.logger
-        end
-      end
-
-      if propono_config = parse_config_file('propono.yml')
-        Propono.config do |config|
-          config.use_iam_profile  = propono_config[:use_iam_profile]
-          config.access_key       = propono_config[:access_key]
-          config.secret_key       = propono_config[:secret_key]
-          config.queue_region     = propono_config[:region]
-          config.application_name = propono_config[:application_name]
-          config.queue_suffix     = propono_config[:queue_suffix]
-          config.udp_host         = "pergo.meducation.net"
-          config.udp_port         = "9732"
-          config.logger           = Filum.logger
-        end
-      end
-    end
-
-    def parse_config_file(filename)
-      contents = File.read("#{@config_dir}/#{filename}")
-      hash = YAML::load(contents)
-      hash.stringify_keys[@env].symbolize_keys
-    rescue
-      nil
+      Configurator.configure(@options)
     end
   end
 end