同步用户sync_gitlab_user,加异常处理

gitlab_guange
Gan Yi.ang 10 years ago
parent 79656aa205
commit e9caf0980a

@ -6,24 +6,30 @@ namespace :gitlab do
users = User.find_by_sql("select * from users where gid is null") users = User.find_by_sql("select * from users where gid is null")
s = Trustie::Gitlab::Sync.new s = Trustie::Gitlab::Sync.new
g = Gitlab.client g = Gitlab.client
logger = Logger.new('./log/add_gid.log', 'daily') #按天生成
users.each do |user| users.each do |user|
us = g.get("/users?search=#{user.mail}") begin
puts user.mail us = g.get("/users?search=#{user.mail}")
if us.blank? puts user.mail
puts "55555555555555555" if us.blank?
s.sync_user(user) puts "55555555555555555"
else s.sync_user(user)
# 解决查询的时候出现多值的情况,比如:123@163.com和g123@163.com else
puts "66666666666666666666" # 解决查询的时候出现多值的情况,比如:123@163.com和g123@163.com
puts user.id puts "66666666666666666666"
if Array === us puts user.id
us.each do |u| if Array === us
if u.email == user.mail us.each do |u|
user.gid = u.id if u.email == user.mail
user.save user.gid = u.id
user.save
end
end end
end end
end end
rescue => e
logger.error("userid=#{user.id},mail=#{user.mail},login=#{user.login},error=#{e}")
puts e
end end
end end
end end

Loading…
Cancel
Save