tim/fluke
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'devops_3' into devops_3_achuchkalov

Browse Source
This commit is contained in:
Anton Chuchkalov 2015-05-29 17:09:49 +04:00
commit 32b0d71693
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
devops-service/routes/v2.0/handlers/server.rb
View File

@ -305,11 +305,13 @@ module Devops
end end
def self.get_server_by_key id, key 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 end
def self.check_chef_node_name name, provider 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") halt(400, "Server with name '#{name}' already exist")
rescue RecordNotFound => e rescue RecordNotFound => e
# server not found - OK # server not found - OK
@ -334,7 +336,7 @@ module Devops
def call(job) def call(job)
@logger.info("Removing node '#{@server.chef_node_name}' form project '#{@server.project}' and env '#{@server.deploy_env}'") @logger.info("Removing node '#{@server.chef_node_name}' form project '#{@server.project}' and env '#{@server.deploy_env}'")
begin begin
delete_server(@server, settings.mongo, @logger) delete_server(@server, Devops::Db.connector, @logger)
rescue => e rescue => e
logger.error "ExpiredHandler error: " + e.message logger.error "ExpiredHandler error: " + e.message
end end