From abc03bcae30a8145ba71aeadeb1681928e3d1e7d Mon Sep 17 00:00:00 2001 From: amartynov Date: Tue, 17 Nov 2015 16:30:56 +0300 Subject: [PATCH] #891: done --- devops-service/providers/provider_factory.rb | 2 +- devops-service/workers/worker.rb | 10 ---------- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/devops-service/providers/provider_factory.rb b/devops-service/providers/provider_factory.rb index 921cceb..44ffa24 100644 --- a/devops-service/providers/provider_factory.rb +++ b/devops-service/providers/provider_factory.rb @@ -39,7 +39,7 @@ module Provider o = Provider.const_get(p.capitalize).new(conf) if o.configured? @@providers[p] = o - @@available_providers << p + ProviderFactory.add_provider p puts "Provider '#{p}' has been loaded" end factory = Provider.const_get(p.capitalize + "AccountsFactory").new diff --git a/devops-service/workers/worker.rb b/devops-service/workers/worker.rb index a6ab79f..eb5af3e 100644 --- a/devops-service/workers/worker.rb +++ b/devops-service/workers/worker.rb @@ -91,11 +91,7 @@ class Worker self.out = out job_result = yield(out, file) - out.puts "TODO: job_result: #{job_result}" canonical_status = (job_result == 0 ? STATUS::COMPLETED : STATUS::FAILED) - out.puts "TODO: status: #{canonical_status}" - out.flush - DevopsLogger.logger.info "TODO: res: #{job_result} status: #{canonical_status}" update_job_status(canonical_status, job_result) rescue StandardError, RecordNotFound => e out << "\n #{e.class}\n #{e.message}\n" @@ -134,10 +130,4 @@ class Worker config end -=begin - def set_status id, status - self.class.set_status(id, status) - end -=end - end