barbeque 0.7.0 → 1.0.0

data/lib/barbeque/version.rb

@@ -1,3 +1,3 @@
 module Barbeque
-  VERSION = '0.7.0'
+  VERSION = '1.0.0'
 end

data/lib/barbeque/worker.rb

@@ -1,14 +1,12 @@
-require 'barbeque/exception_handler'
-require 'barbeque/message_handler'
-require 'barbeque/message_queue'
+require 'barbeque/execution_poller'
+require 'barbeque/retry_poller'
+require 'barbeque/runner'
 require 'serverengine'
 
 module Barbeque
   module Worker
     class UnexpectedMessageType < StandardError; end
 
-    DEFAULT_QUEUE = 'default'
-
     def self.run(
       worker_type: 'process',
       workers:     4,
@@ -33,34 +31,35 @@ module Barbeque
     end
 
     def initialize
-      @queue_name = ENV['BARBEQUE_QUEUE'] || DEFAULT_QUEUE
+      @command =
+        case worker_id
+        when 0
+          ExecutionPoller.new
+        when 1
+          RetryPoller.new
+        else
+          Runner.new
+        end
     end
 
     def run
+      $0 = "barbeque-worker (worker_id=#{worker_id} command=#{@command.class.name})"
       until @stop
-        execute_job
+        begin
+          execute_command
+        rescue => e
+          Barbeque::ExceptionHandler.handle_exception(e)
+        end
       end
     end
 
     def stop
       @stop = true
-      message_queue.stop!
+      @command.stop
     end
 
-    def execute_job
-      message = message_queue.dequeue
-      return unless message
-
-      handler = MessageHandler.const_get(message.type, false)
-      handler.new(message: message, job_queue: message_queue.job_queue).run
-    rescue => e
-      Barbeque::ExceptionHandler.handle_exception(e)
-    end
-
-    private
-
-    def message_queue
-      @message_queue ||= MessageQueue.new(@queue_name)
+    def execute_command
+      @command.run
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: barbeque
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Takashi Kokubun
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-12 00:00:00.000000000 Z
+date: 2017-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: adminlte2-rails
@@ -301,6 +301,8 @@ files:
 - app/models/barbeque/api/revision_lock_resource.rb
 - app/models/barbeque/app.rb
 - app/models/barbeque/application_record.rb
+- app/models/barbeque/docker_container.rb
+- app/models/barbeque/ecs_hako_task.rb
 - app/models/barbeque/job_definition.rb
 - app/models/barbeque/job_execution.rb
 - app/models/barbeque/job_queue.rb
@@ -356,12 +358,19 @@ files:
 - db/migrate/20160516041710_create_job_retries.rb
 - db/migrate/20160829023237_prefix_barbeque_to_tables.rb
 - db/migrate/20170420030157_create_barbeque_sns_subscriptions.rb
+- db/migrate/20170711085157_create_barbeque_docker_containers.rb
+- db/migrate/20170712075449_create_barbeque_ecs_hako_tasks.rb
+- db/migrate/20170724025542_add_index_to_job_execution_status.rb
 - lib/barbeque.rb
 - lib/barbeque/config.rb
 - lib/barbeque/docker_image.rb
 - lib/barbeque/engine.rb
 - lib/barbeque/exception_handler.rb
 - lib/barbeque/execution_log.rb
+- lib/barbeque/execution_poller.rb
+- lib/barbeque/executor.rb
+- lib/barbeque/executor/docker.rb
+- lib/barbeque/executor/hako.rb
 - lib/barbeque/message.rb
 - lib/barbeque/message/base.rb
 - lib/barbeque/message/invalid_message.rb
@@ -373,10 +382,10 @@ files:
 - lib/barbeque/message_handler/job_retry.rb
 - lib/barbeque/message_handler/notification.rb
 - lib/barbeque/message_queue.rb
+- lib/barbeque/retry_poller.rb
 - lib/barbeque/runner.rb
-- lib/barbeque/runner/docker.rb
-- lib/barbeque/runner/hako.rb
 - lib/barbeque/slack_client.rb
+- lib/barbeque/slack_notifier.rb
 - lib/barbeque/version.rb
 - lib/barbeque/worker.rb
 - lib/tasks/barbeque_tasks.rake

data/lib/barbeque/runner/docker.rb

@@ -1,34 +0,0 @@
-require 'open3'
-
-module Barbeque
-  module Runner
-    class Docker
-      # @param [Barbeque::DockerImage] docker_image
-      def initialize(docker_image:)
-        @docker_image = docker_image.to_s
-      end
-
-      # @param [Array<String>] command
-      # @param [Hash] envs
-      # @return [String] stdout
-      # @return [String] stderr
-      # @return [Process::Status] status
-      def run(command, envs)
-        cmd = build_docker_run_command(command, envs)
-        Bundler.with_clean_env { Open3.capture3(*cmd) }
-      end
-
-      private
-
-      def build_docker_run_command(command, envs)
-        ['docker', 'run', *env_options(envs), @docker_image, *command]
-      end
-
-      def env_options(envs)
-        envs.flat_map do |key, value|
-          ['--env', "#{key}=#{value}"]
-        end
-      end
-    end
-  end
-end

data/lib/barbeque/runner/hako.rb

@@ -1,46 +0,0 @@
-require 'open3'
-
-module Barbeque
-  module Runner
-    class Hako
-      # @param [Barbeque::DockerImage] docker_image
-      # @param [String] hako_dir
-      # @param [Hash] hako_env
-      # @param [String] yaml_dir
-      def initialize(docker_image:, hako_dir:, hako_env: {}, yaml_dir:)
-        @app_name = docker_image.repository
-        @tag      = docker_image.tag
-        @hako_dir = hako_dir
-        @hako_env = hako_env
-        @yaml_dir = yaml_dir
-      end
-
-      # @param [Array<String>] command
-      # @param [Hash] envs
-      # @return [String] stdout
-      # @return [String] stderr
-      # @return [Process::Status] status
-      def run(command, envs)
-        cmd = build_hako_oneshot_command(command, envs)
-        Bundler.with_clean_env do
-          Open3.capture3(@hako_env, *cmd, chdir: @hako_dir)
-        end
-      end
-
-      private
-
-      def build_hako_oneshot_command(command, envs)
-        [
-          'bundle', 'exec', 'hako', 'oneshot', '--tag', @tag,
-          *env_options(envs), File.join(@yaml_dir, "#{@app_name}.yml"), '--', *command,
-        ]
-      end
-
-      def env_options(envs)
-        envs.map do |key, value|
-          "--env=#{key}=#{value}"
-        end
-      end
-    end
-  end
-end