GitHub Sale: sign up for any paid plan this week and pay nothing until January 1, 2009!  [ hide ]

public
Rubygem
Description: Merb Core: All you need. None you don't.
Homepage: http://www.merbivore.com
Clone URL: git://github.com/wycats/merb-core.git
Fixes logger delimiter, adds new Merb.fatal! catches, and changes 
Merb.logger = nil to Merb.reset_logger!
wycats (author)
Wed Oct 08 17:43:50 -0700 2008
Drew Colthorp (committer)
Fri Oct 10 10:54:13 -0700 2008
commit  285a8e1a23f303da2f186218c236d149584490cc
tree    b3695208a777ae145f10f417a9bd56abbf633d41
parent  3d4aa1efad1d25de4d8cf93f2fde64b83bb9c30b
...
281
282
283
284
285
286
287
 
 
288
289
290
...
281
282
283
 
 
 
 
284
285
286
287
288
0
@@ -281,10 +281,8 @@ module Merb
0
       Thread.current[:merb_logger] ||= Merb::Logger.new
0
     end
0
 
0
- def logger=(obj)
0
- unless obj
0
- Thread.current[:merb_logger] = nil
0
- end
0
+ def reset_logger!
0
+ Thread.current[:merb_logger] = nil
0
     end
0
 
0
     # ==== Returns
...
292
293
294
295
 
296
297
298
...
292
293
294
 
295
296
297
298
0
@@ -292,7 +292,7 @@ class Merb::BootLoader::Dependencies < Merb::BootLoader
0
   end
0
 
0
   def self.update_logger
0
- Merb.logger = nil
0
+ Merb.reset_logger!
0
 
0
     # If log file is given, use it and not log stream we have.
0
     if Merb::Config[:log_file]
...
74
75
76
77
 
 
78
79
80
81
82
 
 
 
 
 
83
84
85
...
74
75
76
 
77
78
79
80
81
82
 
83
84
85
86
87
88
89
90
0
@@ -74,12 +74,17 @@ module Kernel
0
   def load_dependency(name, *ver, &blk)
0
     dep = name.is_a?(Gem::Dependency) ? name : track_dependency(name, *ver)
0
     gem(dep)
0
- rescue Gem::LoadError
0
+ rescue Gem::LoadError => e
0
+ Merb.fatal! "The gem #{name}, #{ver.inspect} was not found", e
0
   ensure
0
     if block = blk || dep.require_block
0
       block.call
0
     else
0
- require dep.name
0
+ begin
0
+ require dep.name
0
+ rescue LoadError => e
0
+ Merb.fatal! "The file #{dep.name} was not found", e
0
+ end
0
     end
0
     Merb.logger.info!("loading gem '#{dep.name}' ...")
0
     return dep # ensure needs explicit return
...
131
132
133
134
 
135
136
 
137
138
139
...
181
182
183
184
 
185
186
187
...
131
132
133
 
134
135
 
136
137
138
139
...
181
182
183
 
184
185
186
187
0
@@ -131,9 +131,9 @@ module Merb
0
         # Store the PID for this worker
0
         Merb::Server.store_pid(port)
0
 
0
- Merb::Config[:log_delimiter] = "#{$0} ~ "
0
+ Merb::Config[:log_delimiter] = "#{process_title(:worker, port)} ~ "
0
 
0
- Merb.logger = nil
0
+ Merb.reset_logger!
0
         Merb.logger.warn!("Starting #{self.name.split("::").last} at port #{port}")
0
 
0
         # If we can't connect to the port, keep trying until we can. Print
0
@@ -181,7 +181,7 @@ module Merb
0
           "socket#{'s' if max_port > 0 && whoami != :worker} #{numbers} "\
0
           "#{file ? file : "#{Merb.log_path}/#{name}.#{port}.sock"}"
0
         else
0
- "port#{'s' if max_port > 0 && whoami != :worker}"
0
+ "port#{'s' if max_port > 0 && whoami != :worker} #{port}"
0
         end
0
         "#{app} : #{whoami} (#{listening_on})"
0
       end
...
3
4
5
6
7
8
9
...
3
4
5
 
6
7
8
0
@@ -3,7 +3,6 @@ require File.dirname(__FILE__) + '/../../spec_helper'
0
 describe "Kernel#require" do
0
   before do
0
     @logger = StringIO.new
0
- Merb.logger = Merb::Logger.new(@logger)
0
   end
0
 
0
   it "should be able to require and throw a useful error message" do

Comments

    No one has commented yet.