diff options
author | randx <dmitriy.zaporozhets@gmail.com> | 2012-09-12 00:24:53 +0400 |
---|---|---|
committer | randx <dmitriy.zaporozhets@gmail.com> | 2012-09-12 00:24:53 +0400 |
commit | 0523b4265bb19bfff15c6a435dd52ffd6a5683f8 (patch) | |
tree | cf98d62ab3ecdf0a130e8532e750ee3110756709 /lib/gitlab | |
parent | 4903910390dc746f484d6c1206b00fa17007a665 (diff) |
Application logger
Diffstat (limited to 'lib/gitlab')
-rw-r--r-- | lib/gitlab/app_logger.rb | 11 | ||||
-rw-r--r-- | lib/gitlab/backend/gitolite_config.rb | 10 | ||||
-rw-r--r-- | lib/gitlab/git_logger.rb | 11 | ||||
-rw-r--r-- | lib/gitlab/logger.rb | 8 |
4 files changed, 31 insertions, 9 deletions
diff --git a/lib/gitlab/app_logger.rb b/lib/gitlab/app_logger.rb new file mode 100644 index 00000000000..8e4717b46e6 --- /dev/null +++ b/lib/gitlab/app_logger.rb @@ -0,0 +1,11 @@ +module Gitlab + class AppLogger < Gitlab::Logger + def self.file_name + 'application.log' + end + + def format_message(severity, timestamp, progname, msg) + "#{timestamp.to_s(:long)}: #{msg}\n" + end + end +end diff --git a/lib/gitlab/backend/gitolite_config.rb b/lib/gitlab/backend/gitolite_config.rb index 0d636d2d789..f51e8efc370 100644 --- a/lib/gitlab/backend/gitolite_config.rb +++ b/lib/gitlab/backend/gitolite_config.rb @@ -58,18 +58,22 @@ module Gitlab end end rescue PullError => ex - Gitlab::Logger.error("Pull error -> " + ex.message) + log("Pull error -> " + ex.message) raise Gitolite::AccessDenied, ex.message rescue PushError => ex - Gitlab::Logger.error("Push error -> " + " " + ex.message) + log("Push error -> " + " " + ex.message) raise Gitolite::AccessDenied, ex.message rescue Exception => ex - Gitlab::Logger.error(ex.class.name + " " + ex.message) + log(ex.class.name + " " + ex.message) raise Gitolite::AccessDenied.new("gitolite timeout") end + def log message + Gitlab::GitLogger.error(message) + end + def destroy_project(project) FileUtils.rm_rf(project.path_to_repo) conf.rm_repo(project.path) diff --git a/lib/gitlab/git_logger.rb b/lib/gitlab/git_logger.rb new file mode 100644 index 00000000000..fbfed205a0f --- /dev/null +++ b/lib/gitlab/git_logger.rb @@ -0,0 +1,11 @@ +module Gitlab + class GitLogger < Gitlab::Logger + def self.file_name + 'githost.log' + end + + def format_message(severity, timestamp, progname, msg) + "#{timestamp.to_s(:long)} -> #{severity} -> #{msg}\n" + end + end +end diff --git a/lib/gitlab/logger.rb b/lib/gitlab/logger.rb index c3a19e71c10..9405163dced 100644 --- a/lib/gitlab/logger.rb +++ b/lib/gitlab/logger.rb @@ -9,17 +9,13 @@ module Gitlab end def self.read_latest - path = Rails.root.join("log/githost.log") + path = Rails.root.join("log", file_name) self.build unless File.exist?(path) logs = File.read(path).split("\n") end def self.build - new(File.join(Rails.root, "log/githost.log")) + new(File.join(Rails.root, "log", file_name)) end - - def format_message(severity, timestamp, progname, msg) - "#{timestamp.to_s(:long)} -> #{severity} -> #{msg}\n" - end end end |