summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorash <smashwilson@gmail.com>2013-05-18 18:37:51 +0000
committerash <smashwilson@gmail.com>2013-05-18 18:37:51 +0000
commitcdbfbc9be1db8e2ed946dc3b0a0304b9dcfbcf34 (patch)
tree684399adc2d453105456c6bf5f9a6ebced7b675f
parentc1672b42edaf8758fb8f54d9934ac4c287c58492 (diff)
downloadgitlab-shell-cdbfbc9be1db8e2ed946dc3b0a0304b9dcfbcf34.tar.gz
Add logging-related keys to the example config. Use the same default for both.
-rw-r--r--.gitignore1
-rw-r--r--config.yml.example5
-rw-r--r--lib/gitlab_config.rb2
3 files changed, 7 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index 6f536e7..0f0683e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
config.yml
tmp/*
+*.log
diff --git a/config.yml.example b/config.yml.example
index 4bffe14..5bc866d 100644
--- a/config.yml.example
+++ b/config.yml.example
@@ -24,3 +24,8 @@ redis:
# socket: /tmp/redis.socket # Only define this if you want to use sockets
namespace: resque:gitlab
+# Log file.
+log_file: "/home/git/gitlab-shell/gitlab-shell.log"
+
+# Log level. INFO by default
+log_level: INFO
diff --git a/lib/gitlab_config.rb b/lib/gitlab_config.rb
index 5b341a9..2bc2b50 100644
--- a/lib/gitlab_config.rb
+++ b/lib/gitlab_config.rb
@@ -32,7 +32,7 @@ class GitlabConfig
end
def log_file
- @config['log_file'] ||= File.join(ROOT_PATH, 'log', 'gitlab_shell.log')
+ @config['log_file'] ||= File.join(ROOT_PATH, 'gitlab-shell.log')
end
def log_level