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

fix some errors in server create handler

Browse Source
This commit is contained in:
Anton Chuchkalov 2015-06-02 13:49:39 +04:00
parent f611c8545f
commit a23f518196
3 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -75,7 +75,7 @@ module Devops
project.id = params[:project] project.id = params[:project]
old_project = settings.mongo.project params[:project] old_project = settings.mongo.project params[:project]
settings.mongo.project_update project settings.mongo.project_update project
roles = Devops::Model::Project.create_new_roles(old_project, project, logger) roles = Devops::Version2_0::Handler::Project.create_new_roles(old_project, project, logger)
info = "Project '#{project.id}' has been updated." + Project.create_roles_response(roles) info = "Project '#{project.id}' has been updated." + Project.create_roles_response(roles)
create_response(info) create_response(info)
} }
@ -138,9 +138,9 @@ module Devops
"Project '#{params[:project]}' is deleted" "Project '#{params[:project]}' is deleted"
else else
project = settings.mongo.project(params[:project]) project = settings.mongo.project(params[:project])
project.remove_env params[:deploy_env] project.remove_env deploy_env
settings.mongo.project_update project settings.mongo.project_update project
"Project '#{params[:project]}'. Deploy environment '#{params[:deploy_env]}' has been deleted" "Project '#{params[:project]}'. Deploy environment '#{deploy_env}' has been deleted"
end end
create_response(info) create_response(info)
} }
@ -284,7 +284,7 @@ module Devops
old_project.deploy_envs.each do |e| old_project.deploy_envs.each do |e|
new_project.remove_env(e.identifier) new_project.remove_env(e.identifier)
end end
Devops::Model::Project.create_roles new_project.id, new_project.deploy_envs, logger Devops::Version2_0::Handler::Project.create_roles new_project.id, new_project.deploy_envs, logger
end end
def self.create_roles_response roles def self.create_roles_response roles

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

@ -98,7 +98,7 @@ module Devops
halt_response("Invalid security groups '#{buf.join("', '")}' for provider '#{provider.name}'") if buf.empty? halt_response("Invalid security groups '#{buf.join("', '")}' for provider '#{provider.name}'") if buf.empty?
end end
servers = extract_servers(provider, p, env, body, user, settings.mongo) servers = Server.extract_servers(provider, p, env, body, user, settings.mongo)
if body.key?("trace") if body.key?("trace")
stream() do |out| stream() do |out|
begin begin

8
devops-service/workers/worker.rb
View File

@ -17,6 +17,7 @@ class Worker
RUNNING = "running" RUNNING = "running"
COMPLETED = "completed" COMPLETED = "completed"
FAILED = "failed" FAILED = "failed"
IN_QUEUE = "queued"
end end
def convert_config conf def convert_config conf
@ -36,6 +37,13 @@ class Worker
Sidekiq.redis {|con| con.hset "devops", id, status} Sidekiq.redis {|con| con.hset "devops", id, status}
end end
# it is called from creating server handler. But maybe we can somehow refactore code
# to get rid of duplication?
# TODO: check it
def self.set_status id, status
Sidekiq.redis {|con| con.hset "devops", id, status}
end
def call conf, e_provider, dir def call conf, e_provider, dir
FileUtils.mkdir_p(dir) unless File.exists?(dir) FileUtils.mkdir_p(dir) unless File.exists?(dir)
set_status jid, "init" set_status jid, "init"