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

Merge branch 'fix_message' into bug_fix

Browse Source
This commit is contained in:
Anton Martynov 2015-10-27 14:02:50 +03:00
commit 0d60387610
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
devops-service/db/mongo/connectors/helpers/insert_command.rb
View File

@ -20,7 +20,8 @@ module Connectors
collection.insert(record.to_mongo_hash) collection.insert(record.to_mongo_hash)
record record
rescue Mongo::OperationFailure => e rescue Mongo::OperationFailure => e
if e.message =~ /^11000/ # exception's message doesn't always start from error code
if e.message =~ /11000/
resource_name = StringHelper.underscore_class(record.class) resource_name = StringHelper.underscore_class(record.class)
raise InvalidRecord.new("Duplicate key error: #{resource_name} with id '#{record.id}'") raise InvalidRecord.new("Duplicate key error: #{resource_name} with id '#{record.id}'")
end end

2
devops-service/db/mongo/connectors/project.rb
View File

@ -94,7 +94,7 @@ module Connectors
def check_project_auth(project_id, env, user_id) def check_project_auth(project_id, env, user_id)
project = show(project_id) project = show(project_id)
raise InvalidPrivileges.new("User '#{user_id}' unauthorized to work with project '#{project_id}'") unless project.check_authorization(user_id, env) raise InvalidPrivileges.new("User '#{user_id}' is unauthorized to work with project '#{project_id}' and environment '#{env}'") unless project.check_authorization(user_id, env)
project project
end end