mirror of
https://github.com/wahyd4/gitlabhq.git
synced 2026-08-25 04:26:08 +10:00
Izaak Alpert
5d56da6bdd
-The forked merge request test now tests it's componenets again, and seems to work every time (did this by reordering the branch updates so their is more time for update_branches to run) -- this could still technically fail, but after several runs it doesn't seem to. -Removed todo in merge_request, pushed wrapping of grit down to the satellite -updated action test to check flock status, made it nolonger pending -moved all logging on failure to helper method in satellite GITLAB-592 Change-Id: If0554ca35eedc3d3e8461f7d93d4b3939fa2cd75
57 lines
1.4 KiB
Ruby
57 lines
1.4 KiB
Ruby
module Gitlab
|
|
module Satellite
|
|
class Action
|
|
DEFAULT_OPTIONS = {git_timeout: 30.seconds}
|
|
|
|
attr_accessor :options, :project, :user
|
|
|
|
def initialize(user, project, options = {})
|
|
@options = DEFAULT_OPTIONS.merge(options)
|
|
@project = project
|
|
@user = user
|
|
end
|
|
|
|
protected
|
|
|
|
# * Sets a 30s timeout for Git
|
|
# * Locks the satellite repo
|
|
# * Yields the prepared satellite repo
|
|
def in_locked_and_timed_satellite
|
|
Gitlab::ShellEnv.set_env(user)
|
|
|
|
Grit::Git.with_timeout(options[:git_timeout]) do
|
|
project.satellite.lock do
|
|
return yield project.satellite.repo
|
|
end
|
|
end
|
|
rescue Errno::ENOMEM => ex
|
|
return handle_exception(ex)
|
|
rescue Grit::Git::GitTimeout => ex
|
|
return handle_exception(ex)
|
|
ensure
|
|
Gitlab::ShellEnv.reset_env
|
|
end
|
|
|
|
# * Recreates the satellite
|
|
# * Sets up Git variables for the user
|
|
#
|
|
# Note: use this within #in_locked_and_timed_satellite
|
|
def prepare_satellite!(repo)
|
|
project.satellite.clear_and_update!
|
|
|
|
repo.config['user.name']=user.name
|
|
repo.config['user.email']=user.email
|
|
end
|
|
|
|
def default_options(options = {})
|
|
{raise: true, timeout: true}.merge(options)
|
|
end
|
|
|
|
def handle_exception(exception)
|
|
Gitlab::GitLogger.error(exception.message)
|
|
false
|
|
end
|
|
end
|
|
end
|
|
end
|