Gem updates & githost logger

* Grit gem updated
* gitolite-client updated
* logger added
* few fixes

3 files changed, 11 insertions, 0 deletions

diff --git a/lib/gitlabhq/encode.rb b/lib/gitlabhq/encode.rb
index 11d9bd7bfd9..55e86192ad4 100644
--- a/lib/gitlabhq/encode.rb
+++ b/lib/gitlabhq/encode.rb
@@ -3,6 +3,8 @@ module Gitlabhq
     extend self
 
     def utf8 message
+      return nil unless message
+
       hash = CharlockHolmes::EncodingDetector.detect(message) rescue {}
       if hash[:encoding]
         CharlockHolmes::Converter.convert(message, hash[:encoding], 'UTF-8')
diff --git a/lib/gitlabhq/gitolite.rb b/lib/gitlabhq/gitolite.rb
index fabeb7d0fca..48c67082b22 100644
--- a/lib/gitlabhq/gitolite.rb
+++ b/lib/gitlabhq/gitolite.rb
@@ -46,6 +46,7 @@ module Gitlabhq
         end
       end
     rescue Exception => ex
+      Gitlabhq::Logger.error(ex.message)
       raise Gitolite::AccessDenied.new("gitolite timeout")
     end
 
diff --git a/lib/gitlabhq/logger.rb b/lib/gitlabhq/logger.rb
new file mode 100644
index 00000000000..08b4bde0b0c
--- /dev/null
+++ b/lib/gitlabhq/logger.rb
@@ -0,0 +1,8 @@
+module Gitlabhq
+  class Logger
+    def self.error(message)
+      @@logger ||= ::Logger.new(File.join(Rails.root, "log/githost.log"))
+      @@logger.error(message)
+    end
+  end
+end