Changeset 994

Show
Ignore:
Timestamp:
11/14/07 17:22:58 (10 months ago)
Author:
wyca..@gmail.com
Message:

Should fix haml reload

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • apps/rails_benchmark/script/benchmark

    r992 r994  
    1212  ENV["EVENT"] = "1" 
    1313  `mongrel_rails start -d -p 4000 -e production` 
    14   sleep 1 
     14  sleep 5 
    1515  puts Dir[File.join(File.expand_path(__FILE__), "..", "log", "*.pid")] 
    1616  puts Dir["#{File.dirname(__FILE__)}/../log/*.pid"].inspect 

  • trunk/lib/merb/server.rb

    r991 r994  
    332332        # First we collect all files in the project (this will also grab newly added files) 
    333333        project_files = MERB_PATHS.map { |path| Dir[@@merb_opts[:merb_root] + path] }.flatten.uniq 
    334         erb_partials = template_paths("_*.erb").map { |path| Dir[path] }.flatten.uniq 
     334        erb_partials = template_paths.map { |path| Dir[path] }.flatten.uniq 
    335335        project_mtime = max_mtime(project_files + erb_partials) # Latest changed time of all project files 
    336336