Download as
Browse Code »

Commit 0523b4265bb19bfff15c6a435dd52ffd6a5683f8

Authored by randx
1 parent 49039103
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Application logger

Showing 10 changed files with 86 additions and 20 deletions   Show diff stats
app/assets/javascripts/admin.js.coffee
  Diff comments   View file @0523b42
@@ -6,3 +6,7 @@ $ -> @@ -6,3 +6,7 @@ $ ->
6 elems.val('').attr 'disabled', true 6 elems.val('').attr 'disabled', true
7 else 7 else
8 elems.removeAttr 'disabled' 8 elems.removeAttr 'disabled'
  9 +
  10 + $('.log-tabs a').click (e) ->
  11 + e.preventDefault()
  12 + $(this).tab('show')
app/assets/javascripts/application.js
  Diff comments   View file @0523b42
@@ -11,7 +11,7 @@ @@ -11,7 +11,7 @@
11 //= require jquery.endless-scroll 11 //= require jquery.endless-scroll
12 //= require jquery.highlight 12 //= require jquery.highlight
13 //= require jquery.waitforimages 13 //= require jquery.waitforimages
14 -//= require bootstrap-modal 14 +//= require bootstrap
15 //= require modernizr 15 //= require modernizr
16 //= require chosen-jquery 16 //= require chosen-jquery
17 //= require raphael 17 //= require raphael
app/assets/stylesheets/sections/nav.scss
  Diff comments   View file @0523b42
@@ -55,7 +55,6 @@ ul.main_menu { @@ -55,7 +55,6 @@ ul.main_menu {
55 55
56 &.current { 56 &.current {
57 background-color:#D5D5D5; 57 background-color:#D5D5D5;
58 - border-bottom: 1px solid #AAA;  
59 border-right: 1px solid #BBB; 58 border-right: 1px solid #BBB;
60 border-left: 1px solid #BBB; 59 border-left: 1px solid #BBB;
61 border-radius: 0 0 1px 1px; 60 border-radius: 0 0 1px 1px;
app/observers/project_observer.rb
  Diff comments   View file @0523b42
@@ -4,6 +4,18 @@ class ProjectObserver < ActiveRecord::Observer @@ -4,6 +4,18 @@ class ProjectObserver < ActiveRecord::Observer
4 end 4 end
5 5
6 def after_destroy(project) 6 def after_destroy(project)
  7 + log_info("Project \"#{project.name}\" was removed")
  8 +
7 project.destroy_repository 9 project.destroy_repository
8 end 10 end
  11 +
  12 + def after_create project
  13 + log_info("#{project.owner.name} created a new project \"#{project.name}\"")
  14 + end
  15 +
  16 + protected
  17 +
  18 + def log_info message
  19 + Gitlab::AppLogger.info message
  20 + end
9 end 21 end
app/observers/user_observer.rb
  Diff comments   View file @0523b42
1 class UserObserver < ActiveRecord::Observer 1 class UserObserver < ActiveRecord::Observer
2 def after_create(user) 2 def after_create(user)
  3 + log_info("User \"#{user.name}\" (#{user.email}) was created")
  4 +
3 Notify.new_user_email(user.id, user.password).deliver 5 Notify.new_user_email(user.id, user.password).deliver
4 end 6 end
  7 +
  8 + def after_destroy user
  9 + log_info("User \"#{user.name}\" (#{user.email}) was removed")
  10 + end
  11 +
  12 + protected
  13 +
  14 + def log_info message
  15 + Gitlab::AppLogger.info message
  16 + end
5 end 17 end
app/views/admin/logs/show.html.haml
  Diff comments   View file @0523b42
1 -.file_holder#README  
2 - .file_title  
3 - %i.icon-file  
4 - githost.log  
5 - .file_content.logs  
6 - %ol  
7 - - Gitlab::Logger.read_latest.each do |line|  
8 - %li  
9 - %p= line 1 +%ul.nav.nav-tabs.log-tabs
  2 + %li.active
  3 + = link_to "githost.log", "#githost", 'data-toggle' => 'tab'
  4 + %li
  5 + = link_to "application.log", "#application", 'data-toggle' => 'tab'
  6 +.tab-content
  7 + .tab-pane.active#githost
  8 + .file_holder#README
  9 + .file_title
  10 + %i.icon-file
  11 + githost.log
  12 + .file_content.logs
  13 + %ol
  14 + - Gitlab::GitLogger.read_latest.each do |line|
  15 + %li
  16 + %p= line
  17 + .tab-pane#application
  18 + .file_holder#README
  19 + .file_title
  20 + %i.icon-file
  21 + application.log
  22 + .file_content.logs
  23 + %ol
  24 + - Gitlab::AppLogger.read_latest.each do |line|
  25 + %li
  26 + %p= line
lib/gitlab/app_logger.rb 0 → 100644
  Diff comments   View file @0523b42
@@ -0,0 +1,11 @@ @@ -0,0 +1,11 @@
  1 +module Gitlab
  2 + class AppLogger < Gitlab::Logger
  3 + def self.file_name
  4 + 'application.log'
  5 + end
  6 +
  7 + def format_message(severity, timestamp, progname, msg)
  8 + "#{timestamp.to_s(:long)}: #{msg}\n"
  9 + end
  10 + end
  11 +end
lib/gitlab/backend/gitolite_config.rb
  Diff comments   View file @0523b42
@@ -58,18 +58,22 @@ module Gitlab @@ -58,18 +58,22 @@ module Gitlab
58 end 58 end
59 end 59 end
60 rescue PullError => ex 60 rescue PullError => ex
61 - Gitlab::Logger.error("Pull error -> " + ex.message) 61 + log("Pull error -> " + ex.message)
62 raise Gitolite::AccessDenied, ex.message 62 raise Gitolite::AccessDenied, ex.message
63 63
64 rescue PushError => ex 64 rescue PushError => ex
65 - Gitlab::Logger.error("Push error -> " + " " + ex.message) 65 + log("Push error -> " + " " + ex.message)
66 raise Gitolite::AccessDenied, ex.message 66 raise Gitolite::AccessDenied, ex.message
67 67
68 rescue Exception => ex 68 rescue Exception => ex
69 - Gitlab::Logger.error(ex.class.name + " " + ex.message) 69 + log(ex.class.name + " " + ex.message)
70 raise Gitolite::AccessDenied.new("gitolite timeout") 70 raise Gitolite::AccessDenied.new("gitolite timeout")
71 end 71 end
72 72
  73 + def log message
  74 + Gitlab::GitLogger.error(message)
  75 + end
  76 +
73 def destroy_project(project) 77 def destroy_project(project)
74 FileUtils.rm_rf(project.path_to_repo) 78 FileUtils.rm_rf(project.path_to_repo)
75 conf.rm_repo(project.path) 79 conf.rm_repo(project.path)
lib/gitlab/git_logger.rb 0 → 100644
  Diff comments   View file @0523b42
@@ -0,0 +1,11 @@ @@ -0,0 +1,11 @@
  1 +module Gitlab
  2 + class GitLogger < Gitlab::Logger
  3 + def self.file_name
  4 + 'githost.log'
  5 + end
  6 +
  7 + def format_message(severity, timestamp, progname, msg)
  8 + "#{timestamp.to_s(:long)} -> #{severity} -> #{msg}\n"
  9 + end
  10 + end
  11 +end
lib/gitlab/logger.rb
  Diff comments   View file @0523b42
@@ -9,17 +9,13 @@ module Gitlab @@ -9,17 +9,13 @@ module Gitlab
9 end 9 end
10 10
11 def self.read_latest 11 def self.read_latest
12 - path = Rails.root.join("log/githost.log") 12 + path = Rails.root.join("log", file_name)
13 self.build unless File.exist?(path) 13 self.build unless File.exist?(path)
14 logs = File.read(path).split("\n") 14 logs = File.read(path).split("\n")
15 end 15 end
16 16
17 def self.build 17 def self.build
18 - new(File.join(Rails.root, "log/githost.log")) 18 + new(File.join(Rails.root, "log", file_name))
19 end 19 end
20 -  
21 - def format_message(severity, timestamp, progname, msg)  
22 - "#{timestamp.to_s(:long)} -> #{severity} -> #{msg}\n"  
23 - end  
24 end 20 end
25 end 21 end