Skip to content

Commit 08a95dd

Browse files
author
root
committed
Handle Grit exceptions properly
1 parent 7d78148 commit 08a95dd

File tree

1 file changed

+10
-2
lines changed

1 file changed

+10
-2
lines changed

Diff for: lib/redmine_gitolite/admin.rb

+10-2
Original file line numberDiff line numberDiff line change
@@ -111,8 +111,12 @@ def gitolite_admin_repo_commit(message = '')
111111
logger.info { "#{@action} : commiting to Gitolite..." }
112112
begin
113113
@gitolite_admin.save("#{@action} : #{message}", :author => @gitolite_author)
114+
rescue Grit::Git::GitTimeout => e
115+
logger.error { "#{e.message} : #{e.command}" }
116+
rescue Grit::Git::CommandFailed => e
117+
logger.error { "#{e.message} : #{e.command} | #{e.err}" }
114118
rescue => e
115-
logger.error { "Error : #{e.message}" }
119+
logger.error { "#{e.message}" }
116120
end
117121
end
118122

@@ -121,8 +125,12 @@ def gitolite_admin_repo_push
121125
logger.info { "#{@action} : pushing to Gitolite..." }
122126
begin
123127
@gitolite_admin.apply
128+
rescue Grit::Git::GitTimeout => e
129+
logger.error { "#{e.message} : #{e.command}" }
130+
rescue Grit::Git::CommandFailed => e
131+
logger.error { "#{e.message} : #{e.command} | #{e.err}" }
124132
rescue => e
125-
logger.error { "Error : #{e.message}" }
133+
logger.error { "#{e.message}" }
126134
end
127135
end
128136

0 commit comments

Comments
 (0)