From 86326427bc6558a26e3bb9d6b2cb98568bee3581 Mon Sep 17 00:00:00 2001 From: Charles Care Date: Mon, 18 Nov 2019 20:56:12 +0000 Subject: [PATCH] Fixup missing config --- Gemfile | 4 ++-- lib/pipeline/config.rb | 16 +++++++++++++++- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 559326a..df9e0ed 100644 --- a/Gemfile +++ b/Gemfile @@ -7,8 +7,6 @@ gem "rugged" gem "aws-sdk-s3" gem "aws-sdk-ecr" -gem "simplecov", require: false, group: :test - gem "ffi-rzmq" gem "zeitwerk" gem "docopt" @@ -18,4 +16,6 @@ group :development, :test do gem "rake" gem "mocha" gem "minitest" + + gem "simplecov", require: false end diff --git a/lib/pipeline/config.rb b/lib/pipeline/config.rb index a2123ec..bd49b15 100644 --- a/lib/pipeline/config.rb +++ b/lib/pipeline/config.rb @@ -10,10 +10,24 @@ class Pipeline::Config Aws.config.update({ credentials: Aws::Credentials.new(config["aws_access_key_id"], config["aws_secret_access_key"]) }) + puts "HERE" + end def config - @config || YAML.load(File.read(config_file)) + @config ||= begin + loaded_config = YAML.load(File.read(config_file)) + loaded_config["workers"] ||= {} + loaded_config["workers"].each do |worker_class, worker_config| + raise "no default port for #{worker_class}" unless worker_config["shared_queue"] + worker_config.each do |entry, value| + next if entry == "shared_queue" + raise "no port for #{worker_class}:#{entry}" unless value["queue"] + value["worker_versions"] = [] if value["worker_versions"].nil? + end + end + loaded_config + end end def each_worker(&block)