From f30ede67fbe097bc31bf841a7c8e5cae063b1295 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Trung=20L=C3=AA?= Date: Fri, 20 Jul 2018 01:05:40 +1000 Subject: [PATCH 1/4] Add gemspec --- vendor/gems/process_manager-0.0.13/Gemfile | 3 +++ .../process_manager-0.0.13/lib/process_manager.rb | 2 -- .../lib/process_manager/version.rb | 3 +++ .../process_manager-0.0.13/process_manager.gemspec | 12 ++++++++++++ 4 files changed, 18 insertions(+), 2 deletions(-) create mode 100644 vendor/gems/process_manager-0.0.13/Gemfile create mode 100644 vendor/gems/process_manager-0.0.13/lib/process_manager/version.rb create mode 100644 vendor/gems/process_manager-0.0.13/process_manager.gemspec diff --git a/vendor/gems/process_manager-0.0.13/Gemfile b/vendor/gems/process_manager-0.0.13/Gemfile new file mode 100644 index 00000000..d65e2a66 --- /dev/null +++ b/vendor/gems/process_manager-0.0.13/Gemfile @@ -0,0 +1,3 @@ +source 'http://rubygems.org' + +gemspec diff --git a/vendor/gems/process_manager-0.0.13/lib/process_manager.rb b/vendor/gems/process_manager-0.0.13/lib/process_manager.rb index 21c97dae..e7e54cba 100644 --- a/vendor/gems/process_manager-0.0.13/lib/process_manager.rb +++ b/vendor/gems/process_manager-0.0.13/lib/process_manager.rb @@ -11,8 +11,6 @@ require 'process_manager/child' module ProcessManager - VERSION = '0.0.13' - def self.process_running?(pid) begin Process.kill(0, Integer(pid)) diff --git a/vendor/gems/process_manager-0.0.13/lib/process_manager/version.rb b/vendor/gems/process_manager-0.0.13/lib/process_manager/version.rb new file mode 100644 index 00000000..e7dec575 --- /dev/null +++ b/vendor/gems/process_manager-0.0.13/lib/process_manager/version.rb @@ -0,0 +1,3 @@ +module ProcessManager + VERSION = '0.0.13' +end diff --git a/vendor/gems/process_manager-0.0.13/process_manager.gemspec b/vendor/gems/process_manager-0.0.13/process_manager.gemspec new file mode 100644 index 00000000..447d4935 --- /dev/null +++ b/vendor/gems/process_manager-0.0.13/process_manager.gemspec @@ -0,0 +1,12 @@ +require File.expand_path('../lib/process_manager/version', __FILE__) + +Gem::Specification.new do |spec| + spec.name = 'process_manager' + spec.version = ProcessManager::VERSION + spec.summary = 'Process Manager' + spec.files = Dir['{lib}/**/*'] + spec.require_paths = ['lib'] + spec.author = 'Amazon Web Services' + spec.add_dependency('logging', '~> 1.8') + spec.add_dependency('simple_pid', '~> 0.2.1') +end From 01b71673fec8c372443fdd22635e65546e8505a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Trung=20L=C3=AA?= Date: Fri, 20 Jul 2018 01:06:29 +1000 Subject: [PATCH 2/4] Remove logging gem dependency --- codedeploy_agent-1.1.0.gemspec | 1 - 1 file changed, 1 deletion(-) diff --git a/codedeploy_agent-1.1.0.gemspec b/codedeploy_agent-1.1.0.gemspec index e3138485..71663a92 100644 --- a/codedeploy_agent-1.1.0.gemspec +++ b/codedeploy_agent-1.1.0.gemspec @@ -13,7 +13,6 @@ Gem::Specification.new do |spec| spec.add_dependency('json_pure', '~> 1.6') spec.add_dependency('archive-tar-minitar', '~> 0.5.2') spec.add_dependency('rubyzip', '~> 1.1.0') - spec.add_dependency('logging', '~> 1.8') spec.add_dependency('aws-sdk-core', '~> 2.9') spec.add_dependency('simple_pid', '~> 0.2.1') spec.add_dependency('docopt', '~> 0.5.0') From 6fcf29640f2c88a65fba58e510478ed8998ee0a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Trung=20L=C3=AA?= Date: Fri, 20 Jul 2018 01:56:56 +1000 Subject: [PATCH 3/4] Remove the defined check --- .../lib/process_manager.rb | 68 +++++++++---------- 1 file changed, 33 insertions(+), 35 deletions(-) diff --git a/vendor/gems/process_manager-0.0.13/lib/process_manager.rb b/vendor/gems/process_manager-0.0.13/lib/process_manager.rb index e7e54cba..6d1d9781 100644 --- a/vendor/gems/process_manager-0.0.13/lib/process_manager.rb +++ b/vendor/gems/process_manager-0.0.13/lib/process_manager.rb @@ -2,46 +2,44 @@ require 'socket' require 'etc' -unless defined?(ProcessManager) - $: << File.expand_path(File.dirname(__FILE__) + '/lib') - require 'core_ext' - require 'process_manager/config' - require 'process_manager/log' - require 'process_manager/master' - require 'process_manager/child' +$: << File.expand_path(File.dirname(__FILE__) + '/lib') +require 'core_ext' +require 'process_manager/config' +require 'process_manager/log' +require 'process_manager/master' +require 'process_manager/child' - module ProcessManager - def self.process_running?(pid) - begin - Process.kill(0, Integer(pid)) - return true - rescue Errno::EPERM # changed uid - return false - rescue Errno::ESRCH # deceased or zombied - return false - rescue - puts "ERROR: couldn't check the status of process #{pid}" - return false - end - end - - def self.set_program_name(name) - $PROGRAM_NAME = "#{ProcessManager::Config.config[:program_name]}: #{name}" +module ProcessManager + def self.process_running?(pid) + begin + Process.kill(0, Integer(pid)) + return true + rescue Errno::EPERM # changed uid + return false + rescue Errno::ESRCH # deceased or zombied + return false + rescue + puts "ERROR: couldn't check the status of process #{pid}" + return false end + end - def self.on_error(&block) - @@_error_callbacks ||= [] - @@_error_callbacks << block - nil - end + def self.set_program_name(name) + $PROGRAM_NAME = "#{ProcessManager::Config.config[:program_name]}: #{name}" + end - def self.on_error_callbacks - @@_error_callbacks ||= [] - end + def self.on_error(&block) + @@_error_callbacks ||= [] + @@_error_callbacks << block + nil + end - def self.reset_on_error_callbacks - @@_error_callbacks = [] - end + def self.on_error_callbacks + @@_error_callbacks ||= [] + end + def self.reset_on_error_callbacks + @@_error_callbacks = [] end + end From 2f277c4b24108fad0739385c169077217f30c09d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Trung=20L=C3=AA?= Date: Fri, 20 Jul 2018 01:57:20 +1000 Subject: [PATCH 4/4] Correct the dependency require in child/master class --- lib/instance_agent/runner/child.rb | 2 +- lib/instance_agent/runner/master.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/instance_agent/runner/child.rb b/lib/instance_agent/runner/child.rb index ac96a293..7e74d7f3 100644 --- a/lib/instance_agent/runner/child.rb +++ b/lib/instance_agent/runner/child.rb @@ -1,5 +1,5 @@ # encoding: UTF-8 -require 'process_manager/child' +require 'process_manager' require 'thread' module InstanceAgent diff --git a/lib/instance_agent/runner/master.rb b/lib/instance_agent/runner/master.rb index 902f15f9..7deb8e78 100644 --- a/lib/instance_agent/runner/master.rb +++ b/lib/instance_agent/runner/master.rb @@ -1,5 +1,5 @@ # encoding: UTF-8 -require 'process_manager/master' +require 'process_manager' require 'instance_metadata' require 'instance_agent/plugins/codedeploy/deployment_command_tracker'