wrapbox 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8118b81067d91ea3535d8c3c5ca1ba55c412d345
-  data.tar.gz: 33fb0eb243ff53a6bc6ec7c5147a69ea3bbbc206
+  metadata.gz: 67a6e2d03ab3ecd91eb20638f7ea5faa3b42e6e9
+  data.tar.gz: d64a6d52580d830f3c48dad77885fb1d344baaa9
 SHA512:
-  metadata.gz: 5e9a9730bca6b1dddbe9a8c21a2660645dc0d3f6f3c71a74c24e175930a6bd01544e2f2b2efd6d04fc0b14bdbeeded4a4d5ad7abe38e37c4c5abe83593c1a37c
-  data.tar.gz: 74c5c6831768ed37e5107903426131a4158220b808b39fae6d08b74df14dcfcc2f9bd495ec1ce3f6157a66ee5602f08a5161e0c73b6535f1cefdf4ebbf14a388
+  metadata.gz: dc8c3a0b68c1d636a501cf205fa41741c526b1c432d2e2e09875b181a4bf3e3b3d8e2ff754ef341f7fcf6d98426a1a187eafdcca8d6c03241ecc7f531625d982
+  data.tar.gz: 800d8fedf7f5d0aea0850b3d5158699d0107ccfda0eb2f00319e331af2e38d48ba0e18a274bca0c08f6f008cda1761d2cfb70e018bd40342c912ce70043cb9bd

data/README.md

@@ -85,6 +85,17 @@ Wrapbox.run_cmd(["ls ."], environments: [{name: "RAILS_ENV", value: "development
 | additional_container_definitions | Container definitions for sub containers                                                                    |
 | task_role_arn                    | see. http://docs.aws.amazon.com/AmazonECS/latest/developerguide/task-iam-roles.html                         |
 
+`WRAPBOX_CMD_INDEX` environment variable is available in `run_cmd` and you can distinguish logs from each command like below:
+
+```
+log_configuration:
+  log_driver: syslog
+  options:
+    syslog-address: "tcp://192.168.0.42:123"
+    env: WRAPBOX_CMD_INDEX
+    tag: wrapbox-{{ printf "%03s" (.ExtraAttributes nil).WRAPBOX_CMD_INDEX }}
+```
+
 ### for docker
 | name                 | desc                                                        |
 | -------------------- | ----------------------------------------------------------- |

data/lib/wrapbox/runner/docker.rb

@@ -35,9 +35,10 @@ module Wrapbox
 
         environments = extract_environments(environments)
 
-        ths = cmds.map do |cmd|
-          Thread.new(cmd) do |c|
-            exec_docker(definition: definition, cmd: c.split(/\s+/), environments: environments)
+        ths = cmds.map.with_index do |cmd, idx|
+          Thread.new(cmd, idx) do |c, i|
+            envs = environments + ["WRAPBOX_CMD_INDEX=#{idx}"]
+            exec_docker(definition: definition, cmd: c.split(/\s+/), environments: envs)
           end
         end
         ths.each(&:join)

data/lib/wrapbox/runner/ecs.rb

@@ -4,6 +4,7 @@ require "thor"
 require "yaml"
 require "active_support/core_ext/hash"
 require "logger"
+require "pp"
 
 require "wrapbox/config_repository"
 require "wrapbox/version"
@@ -76,14 +77,15 @@ module Wrapbox
 
       def run_cmd(cmds, container_definition_overrides: {}, **parameters)
         task_definition = register_task_definition(container_definition_overrides)
-        parameter = Parameter.new(**parameters)
 
-        ths = cmds.map do |cmd|
-          Thread.new(cmd) do |c|
+        ths = cmds.map.with_index do |cmd, idx|
+          Thread.new(cmd, idx) do |c, i|
+            Thread.current[:cmd_index] = i
+            envs = (parameters[:environments] || []) + [{name: "WRAPBOX_CMD_INDEX", value: i.to_s}]
             run_task(
               task_definition.task_definition_arn, nil, nil, nil,
               c.split(/\s+/),
-              parameter
+              Parameter.new(**parameters.merge(environments: envs))
             )
           end
         end
@@ -111,7 +113,7 @@ module Wrapbox
           task_status = fetch_task_status(cl, task.task_arn)
 
           # If exit_code is nil, Container is force killed or ECS failed to launch Container by Irregular situation
-          error_message = "Container #{task_definition_name} is failed. task=#{task.task_arn}, exit_code=#{task_status[:exit_code]}, reason=#{task_status[:stopped_reason]}"
+          error_message = build_error_message(task_definition_name, task.task_arn, task_status)
           raise ContainerAbnormalEnd, error_message unless task_status[:exit_code]
           raise ExecutionFailure, error_message unless task_status[:exit_code] == 0
 
@@ -142,8 +144,10 @@ module Wrapbox
         current_retry_interval = parameter.retry_interval
 
         begin
+          run_task_options = build_run_task_options(task_definition_arn, class_name, method_name, args, command, cl, parameter.environments, parameter.task_role_arn)
+          @logger.debug("Task Options: #{run_task_options}")
           task = client
-            .run_task(build_run_task_options(task_definition_arn, class_name, method_name, args, command, cl, parameter.environments, parameter.task_role_arn))
+            .run_task(run_task_options)
             .tasks[0]
 
           raise LackResource unless task # this case is almost lack of container resource.
@@ -194,7 +198,8 @@ module Wrapbox
           end
         rescue LaunchFailure
           if launch_try_count >= parameter.launch_retry
-            raise
+            task_status = fetch_task_status(cl, task.task_arn)
+            raise LaunchFailure, build_error_message(task_definition_name, task.task_arn, task_status)
           else
             launch_try_count += 1
             @logger.debug("Retry Create Task after #{current_retry_interval} sec")
@@ -236,8 +241,13 @@ module Wrapbox
 
       def fetch_task_status(cluster, task_arn)
         task = client.describe_tasks(cluster: cluster, tasks: [task_arn]).tasks[0]
-        container = task.containers.find { |c| c.name = task_definition_name }
-        {last_status: task.last_status, exit_code: container.exit_code, stopped_reason: task.stopped_reason}
+        container = task.containers.find { |c| c.name == task_definition_name }
+        {
+          last_status: task.last_status,
+          exit_code: container.exit_code,
+          stopped_reason: task.stopped_reason,
+          container_stopped_reason: container.reason
+        }
       end
 
       def register_task_definition(container_definition_overrides)
@@ -337,6 +347,13 @@ module Wrapbox
         }
       end
 
+      def build_error_message(task_definition_name, task_arn, task_status)
+        error_message = "Container #{task_definition_name} is failed. task=#{task_arn}, "
+        error_message << "cmd_index=#{Thread.current[:cmd_index]}, " if Thread.current[:cmd_index]
+        error_message << "exit_code=#{task_status[:exit_code]}, task_stopped_reason=#{task_status[:stopped_reason]}, container_stopped_reason=#{task_status[:container_stopped_reason]}"
+        error_message
+      end
+
       class Cli < Thor
         namespace :ecs
 
@@ -360,6 +377,7 @@ module Wrapbox
             {name: k, value: v}
           end
           run_options = {
+            cluster: options[:cluster],
             task_role_arn: options[:task_role_arn],
             timeout: options[:timeout],
             launch_timeout: options[:launch_timeout],

data/lib/wrapbox/version.rb

@@ -1,3 +1,3 @@
 module Wrapbox
-  VERSION = "0.3.0"
+  VERSION = "0.4.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wrapbox
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - joker1007
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-03-19 00:00:00.000000000 Z
+date: 2017-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -212,7 +212,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Ruby method runner on AWS ECS