Ruby on Rails | Screencasts | Download | Documentation | Weblog | Community | Source

Changeset 5627

Show
Ignore:
Timestamp:
11/25/06 19:59:00 (2 years ago)
Author:
david
Message:

Tried delaying database disconnect until after dependency resolution (references #6687, #6700) [DHH]

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • branches/1-2-pre-release/railties/lib/dispatcher.rb

    r5617 r5627  
    5656    # to restart the server (WEBrick, FastCGI, etc.). 
    5757    def reset_application! 
    58       if defined?(ActiveRecord) 
    59         ActiveRecord::Base.reset_subclasses 
    60         ActiveRecord::Base.clear_active_connections! 
    61       end 
     58      ActiveRecord::Base.reset_subclasses if defined?(ActiveRecord) 
    6259 
    6360      Dependencies.clear 
     
    6562        Class.remove_class(*Reloadable.reloadable_classes) 
    6663      end 
     64         
     65      ActiveRecord::Base.clear_active_connections! if defined?(ActiveRecord) 
    6766    end 
    68      
    6967     
    7068    # Add a preparation callback. Preparation callbacks are run before every 
  • trunk/railties/lib/dispatcher.rb

    r5618 r5627  
    5656    # to restart the server (WEBrick, FastCGI, etc.). 
    5757    def reset_application! 
    58       if defined?(ActiveRecord) 
    59         ActiveRecord::Base.reset_subclasses 
    60         ActiveRecord::Base.clear_active_connections! 
    61       end 
     58      ActiveRecord::Base.reset_subclasses if defined?(ActiveRecord) 
    6259 
    6360      Dependencies.clear 
     
    6562        Class.remove_class(*Reloadable.reloadable_classes) 
    6663      end 
     64         
     65      ActiveRecord::Base.clear_active_connections! if defined?(ActiveRecord) 
    6766    end 
    68      
    6967     
    7068    # Add a preparation callback. Preparation callbacks are run before every