wrapbox 0.8.2 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d0945185eb499784f2b696a4f65947f05f9225edb203a6a1c1d3b00e9b5e3d2f
-  data.tar.gz: f595d49cae8a2bde5ffe8dded0d0b25e1e4ff817f4bbcc7ec838774ed715c04c
+  metadata.gz: 00df8d3c0e46ae38cdef3ada6dde9db32adf2313b03d910591e98a9129b1d787
+  data.tar.gz: 61739c6ac9544da2b2ea83fd538831e6782ee78d9e0d2ddc8f2424e409d48474
 SHA512:
-  metadata.gz: fb901d6faadfe0fb1e84eb2ff586488fb9c1a7e2bb7724272675a7e25cd0cbb66d70a4fba124f855f5e45797350b55370d961dca07b85819a6bef4aa5e0b5314
-  data.tar.gz: 4cc9fa285184986af51b433e1404b5f7c07c0d24e594b735661ea586faa80ada6e1a18a5faec061ffc638a368cd3543747b828eed27c33529df0a6aa2867f9f3
+  metadata.gz: 97c9a51c95c80f93ec16443eaca2e91890da6a1d7574f6d62be200ac2db8a997bcae61dc74da0467b3aa4aac751c81db86ea3943f86988ff78644b52efad92d3
+  data.tar.gz: bae99aa04b2540582132f769d0db1b20dd171956cef2bd8fb08b4d16f430365c56ba86a0c706ad37b6499ee0b037093828703d752ae0672f9d16e4ad0a1ace59

data/lib/wrapbox.rb

@@ -1,9 +1,13 @@
+require "logger"
+
 module Wrapbox
   CLASS_NAME_ENV = "WRAPBOX_CLASS_NAME".freeze
   METHOD_NAME_ENV = "WRAPBOX_METHOD_NAME".freeze
   METHOD_ARGS_ENV = "WRAPBOX_METHOD_ARGS".freeze
 
   class << self
+    attr_accessor :logger
+
     def load_config(filename)
       configs.load_yaml(filename)
     end
@@ -26,6 +30,10 @@ module Wrapbox
       config.run_cmd(*args, **options)
     end
   end
+
+  $stdout.sync = true
+  self.logger = Logger.new($stdout)
+  self.logger.level = :info
 end
 
 require "wrapbox/version"

data/lib/wrapbox/runner/docker.rb

@@ -17,7 +17,7 @@ module Wrapbox
       def initialize(options)
         @name = options[:name]
         @container_definitions = options[:container_definition] ? [options[:container_definition]] : options[:container_definitions]
-        @logger = Logger.new($stdout)
+        @logger = Wrapbox.logger
 
         if @container_definitions.size >= 2
           raise "Docker runner does not support multi container currently"
@@ -138,7 +138,9 @@ module Wrapbox
         method_option :memory, type: :numeric
         method_option :environments, aliases: "-e"
         method_option :ignore_signal, type: :boolean, default: false, desc: "Even if receive a signal (like TERM, INT, QUIT), Docker container continue running"
+        method_option :verbose, aliases: "-v", type: :boolean, default: false, desc: "Verbose mode"
         def run_cmd(*args)
+          Wrapbox.logger.level = :debug if options[:verbose]
           Wrapbox.load_config(options[:config])
           config = Wrapbox.configs[options[:config_name]]
           environments = options[:environments].to_s.split(/,\s*/).map { |kv| kv.split("=") }.map do |k, v|

data/lib/wrapbox/runner/ecs.rb

@@ -93,8 +93,7 @@ module Wrapbox
 
         @task_role_arn = options[:task_role_arn]
         @execution_role_arn = options[:execution_role_arn]
-        $stdout.sync = true
-        @logger = Logger.new($stdout)
+        @logger = Wrapbox.logger
         if options[:log_fetcher]
           type = options[:log_fetcher][:type]
           @log_fetcher = LogFetcher.new(type, options[:log_fetcher])
@@ -212,7 +211,7 @@ module Wrapbox
             raise
           else
             execution_try_count += 1
-            @logger.debug("Retry Execution after #{EXECUTION_RETRY_INTERVAL} sec")
+            @logger.warn("Retry Execution after #{EXECUTION_RETRY_INTERVAL} sec (#{execution_try_count}/#{parameter.execution_retry})")
             sleep EXECUTION_RETRY_INTERVAL
             retry
           end
@@ -250,7 +249,7 @@ module Wrapbox
           task = resp.tasks[0]
 
           resp.failures.each do |failure|
-            @logger.debug("Failure: Arn=#{failure.arn}, Reason=#{failure.reason}")
+            @logger.warn("Failure: Arn=#{failure.arn}, Reason=#{failure.reason}")
           end
           raise LackResource unless task # this case is almost lack of container resource.
 
@@ -288,14 +287,14 @@ module Wrapbox
             end
           end
         rescue LackResource
-          @logger.debug("Failed to create task, because of lack resource")
+          @logger.warn("Failed to create task, because of lack resource")
           put_waiting_task_count_metric(cl)
 
           if launch_try_count >= parameter.launch_retry
             raise
           else
             launch_try_count += 1
-            @logger.debug("Retry Create Task after #{current_retry_interval} sec")
+            @logger.warn("Retry Create Task after #{current_retry_interval} sec (#{launch_try_count}/#{parameter.launch_retry})")
             sleep current_retry_interval
             current_retry_interval = [current_retry_interval * parameter.retry_interval_multiplier, parameter.max_retry_interval].min
             retry
@@ -306,7 +305,7 @@ module Wrapbox
             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")
+            @logger.warn("Retry Create Task after #{current_retry_interval} sec (#{launch_try_count}/#{parameter.launch_retry})")
             sleep current_retry_interval
             current_retry_interval = [current_retry_interval * parameter.retry_interval_multiplier, parameter.max_retry_interval].min
             retry
@@ -511,7 +510,9 @@ module Wrapbox
         method_option :execution_retry, type: :numeric
         method_option :max_retry_interval, type: :numeric
         method_option :ignore_signal, type: :boolean, default: false, desc: "Even if receive a signal (like TERM, INT, QUIT), ECS Tasks continue running"
+        method_option :verbose, aliases: "-v", type: :boolean, default: false, desc: "Verbose mode"
         def run_cmd(*args)
+          Wrapbox.logger.level = :debug if options[:verbose]
           Wrapbox.load_config(options[:config])
           config = Wrapbox.configs[options[:config_name]]
           environments = options[:environments].to_s.split(/,\s*/).map { |kv| kv.split("=") }.map do |k, v|

data/lib/wrapbox/version.rb

@@ -1,3 +1,3 @@
 module Wrapbox
-  VERSION = "0.8.2"
+  VERSION = "0.9.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wrapbox
 version: !ruby/object:Gem::Version
-  version: 0.8.2
+  version: 0.9.0
 platform: ruby
 authors:
 - joker1007
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-10-26 00:00:00.000000000 Z
+date: 2018-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-ecs
@@ -229,7 +229,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 2.7.8
 signing_key: 
 specification_version: 4
 summary: Ruby method runner on AWS ECS