From a43751e0b371d2ad3714ed0b1ad85eeb4c2f4736 Mon Sep 17 00:00:00 2001 From: amartynov Date: Fri, 29 May 2015 16:57:31 +0300 Subject: [PATCH] fixed error with settings --- devops-service/routes/v2.0/handlers/server.rb | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/devops-service/routes/v2.0/handlers/server.rb b/devops-service/routes/v2.0/handlers/server.rb index 3a991d6..82354c6 100644 --- a/devops-service/routes/v2.0/handlers/server.rb +++ b/devops-service/routes/v2.0/handlers/server.rb @@ -305,11 +305,13 @@ module Devops end def self.get_server_by_key id, key - key == "instance" ? settings.mongo.server_by_instance_id(id) : settings.mongo.server_by_chef_node_name(id) + mongo = Devops::Db.connector + key == "instance" ? mongo.server_by_instance_id(id) : mongo.server_by_chef_node_name(id) end def self.check_chef_node_name name, provider - settings.mongo.server_by_chef_node_name name + mongo = Devops::Db.connector + mongo.server_by_chef_node_name name halt(400, "Server with name '#{name}' already exist") rescue RecordNotFound => e # server not found - OK @@ -334,7 +336,7 @@ module Devops def call(job) @logger.info("Removing node '#{@server.chef_node_name}' form project '#{@server.project}' and env '#{@server.deploy_env}'") begin - delete_server(@server, settings.mongo, @logger) + delete_server(@server, Devops::Db.connector, @logger) rescue => e logger.error "ExpiredHandler error: " + e.message end