diff options
author | Dmitriy Zaporozhets <dzaporozhets@gitlab.com> | 2015-02-12 19:25:05 +0000 |
---|---|---|
committer | Dmitriy Zaporozhets <dzaporozhets@gitlab.com> | 2015-02-12 19:25:05 +0000 |
commit | f61186ba00ac1c6e96e4e16d7fe118debcdda1ea (patch) | |
tree | 572e0a87bd7d3ed9b7c064a68cd358000a2a7ab1 /lib | |
parent | 63e16172e524d83e4fe04945e277bc21dda6d777 (diff) | |
parent | ddb0a8d1545629e1e56397bed43c388dcb85324f (diff) | |
download | gitlab-shell-f61186ba00ac1c6e96e4e16d7fe118debcdda1ea.tar.gz |
Merge branch 'log-api-error' into 'master'
Log full Net::HTTP error.
See merge request !56
Diffstat (limited to 'lib')
-rw-r--r-- | lib/gitlab_net.rb | 3 | ||||
-rw-r--r-- | lib/gitlab_shell.rb | 1 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/gitlab_net.rb b/lib/gitlab_net.rb index 6e76c98..e74c97f 100644 --- a/lib/gitlab_net.rb +++ b/lib/gitlab_net.rb @@ -101,7 +101,8 @@ class GitlabNet begin response = http.start { http.request(request) } - rescue + rescue => e + $logger.warn "Failed to connect to internal API <#{method.to_s.upcase} #{url}>: #{e.inspect}" raise ApiUnreachableError end diff --git a/lib/gitlab_shell.rb b/lib/gitlab_shell.rb index 9605136..6422fff 100644 --- a/lib/gitlab_shell.rb +++ b/lib/gitlab_shell.rb @@ -36,7 +36,6 @@ class GitlabShell puts "Welcome to GitLab, #{username}!" end rescue GitlabNet::ApiUnreachableError => ex - $logger.warn "gitlab-shell: Failed to connect to internal API" puts "Failed to authorize your Git request: internal API unreachable" rescue DisallowedCommandError => ex message = "gitlab-shell: Attempt to execute disallowed command <#{@origin_cmd}> by #{log_username}." |