From ea2046c9326d3989344cc8c1a177fbeacacb1338 Mon Sep 17 00:00:00 2001 From: Anton Chuchkalov Date: Thu, 30 Jul 2015 12:18:55 +0200 Subject: [PATCH] rename stack_sync_worker to stack_bootstrap_worker --- devops-service/app/api2/handlers/stack.rb | 2 +- devops-service/app/api2/handlers/stack_preset.rb | 4 ++-- devops-service/commands/stack.rb | 8 ++++++-- devops-service/workers/run_workers.rb | 2 +- .../{stack_sync_worker.rb => stack_bootstrap_worker.rb} | 6 +++--- 5 files changed, 13 insertions(+), 9 deletions(-) rename devops-service/workers/{stack_sync_worker.rb => stack_bootstrap_worker.rb} (90%) diff --git a/devops-service/app/api2/handlers/stack.rb b/devops-service/app/api2/handlers/stack.rb index 6c1fa3d..c54a70b 100644 --- a/devops-service/app/api2/handlers/stack.rb +++ b/devops-service/app/api2/handlers/stack.rb @@ -19,7 +19,7 @@ module Devops stack.owner = owner_from_request Devops::Db.connector.stack_insert(stack) - file = JobStarter.start_job(:worker, :sync_stack_till_not_in_progress, + file = JobStarter.start_job(:worker, :stack_bootstrap, provider: stack.provider, stack_id: stack.id, request: @request diff --git a/devops-service/app/api2/handlers/stack_preset.rb b/devops-service/app/api2/handlers/stack_preset.rb index 01fc9b0..5d362ee 100644 --- a/devops-service/app/api2/handlers/stack_preset.rb +++ b/devops-service/app/api2/handlers/stack_preset.rb @@ -1,6 +1,6 @@ require 'json' require 'lib/stack_presets/factory' -require 'workers/stack_sync_worker' +require 'workers/stack_bootstrap_worker' require 'workers/job_starter' require_relative "request_handler" @@ -23,7 +23,7 @@ module Devops stack.owner = owner_from_request Devops::Db.connector.stack_insert(stack) - file = JobStarter.start_job(:worker, :sync_stack_till_not_in_progress, + file = JobStarter.start_job(:worker, :stack_bootstrap, provider: stack.provider, stack_id: stack.id, request: @request diff --git a/devops-service/commands/stack.rb b/devops-service/commands/stack.rb index 243281f..bfbad63 100644 --- a/devops-service/commands/stack.rb +++ b/devops-service/commands/stack.rb @@ -5,7 +5,7 @@ module StackCommands include ServerCommands extend self - def sync_stack_till_not_in_progress_proc + def stack_bootstrap_proc lambda do |out, stack, mongo| # two tries each 4 seconds, then 5 tries each 10 seconds, then 5 tries each minute. sleep_times = [4]*2 + [10]*5 + [60]*5 @@ -29,8 +29,12 @@ module StackCommands end end + def bootstrap_stack_servers + + end + CommandsStorage.add_job_lambda( - sync_stack_till_not_in_progress: sync_stack_till_not_in_progress_proc + stack_bootstrap: stack_bootstrap_proc ) end diff --git a/devops-service/workers/run_workers.rb b/devops-service/workers/run_workers.rb index 7bd89d8..7dac55e 100644 --- a/devops-service/workers/run_workers.rb +++ b/devops-service/workers/run_workers.rb @@ -4,7 +4,7 @@ require File.join(root, "create_server_worker") require File.join(root, "deploy_worker") require File.join(root, "bootstrap_worker") require File.join(root, "project_test_worker") -require File.join(root, "stack_sync_worker") +require File.join(root, "stack_bootstrap_worker") config = {} #require File.join(root, "../proxy") diff --git a/devops-service/workers/stack_sync_worker.rb b/devops-service/workers/stack_bootstrap_worker.rb similarity index 90% rename from devops-service/workers/stack_sync_worker.rb rename to devops-service/workers/stack_bootstrap_worker.rb index 91a172c..f70d0db 100644 --- a/devops-service/workers/stack_sync_worker.rb +++ b/devops-service/workers/stack_bootstrap_worker.rb @@ -5,7 +5,7 @@ require "db/mongo/models/project" require "db/mongo/models/report" require 'workers/workers_storage' -class StackSyncWorker < Worker +class StackBootstrapWorker < Worker include StackCommands # besides options came from JobStarter we need: @@ -16,7 +16,7 @@ class StackSyncWorker < Worker stack = mongo.stack(options['stack_id']) save_report(mongo, stack, file) - status = sync_stack_till_not_in_progress_proc.call(out, stack, mongo) + status = stack_bootstrap_proc.call(out, stack, mongo) persist_stack_servers_in_mongo!(mongo, stack, provider) status end @@ -65,4 +65,4 @@ class StackSyncWorker < Worker end end -WorkersStorage.add_worker(sync_stack_till_not_in_progress: StackSyncWorker) +WorkersStorage.add_worker(stack_bootstrap: StackBootstrapWorker)