summaryrefslogtreecommitdiff
path: root/chef-server/lib/init.rb
diff options
context:
space:
mode:
authorAdam Jacob <adam@hjksolutions.com>2008-10-08 21:40:02 -0700
committerAdam Jacob <adam@hjksolutions.com>2008-10-08 21:40:02 -0700
commit4dbefb3728643479f9e7f08c3d517c23b12bb29a (patch)
tree6a047d523b590f9a1be307898bac1f2073f4b6d1 /chef-server/lib/init.rb
parent8655ef1cf2aa350c81b8edd0948dc3f55920034c (diff)
downloadchef-4dbefb3728643479f9e7f08c3d517c23b12bb29a.tar.gz
Adding example-repository
Diffstat (limited to 'chef-server/lib/init.rb')
-rw-r--r--chef-server/lib/init.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/chef-server/lib/init.rb b/chef-server/lib/init.rb
index 45dd4495a1..921afc4ff8 100644
--- a/chef-server/lib/init.rb
+++ b/chef-server/lib/init.rb
@@ -16,7 +16,7 @@
# limitations under the License.
#
-Merb.root = File.join(File.dirname(__FILE__))
+Merb.root = Chef::Config[:merb_root]
#
# ==== Structure of Merb initializer
@@ -146,6 +146,7 @@ Merb::Config.use do |c|
c[:exception_details] = true
c[:reload_classes] = true
c[:log_level] = :debug
+ c[:log_stream] = STDOUT
end
Merb.logger.info("Compiling routes...")