Merge pull request #7119 from tensor-dev/improve-git-timeout-logging

Improve git timeout logging
gitlabhq · Jul 23, 2014 · 8759577 · 8759577
2 parents e46b644 + dbefe90
commit 8759577
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/lib/gitlab/satellite/action.rb b/lib/gitlab/satellite/action.rb
@@ -48,7 +48,14 @@ def default_options(options = {})
       end
 
       def handle_exception(exception)
-        Gitlab::GitLogger.error(exception.message)
+        if exception.instance_of?(Grit::Git::GitTimeout)
+          detailed_message = exception.message
+          detailed_message << ' ' << exception.command
+          detailed_message << ' ' << exception.bytes_read
+          Gitlab::GitLogger.error(detailed_message)
+        else
+          Gitlab::GitLogger.error(exception.message)
+        end
         false
       end
     end