Changeset 1488 for trunk

Timestamp:

Feb 23, 2010, 11:21:42 PM (15 years ago)

Author:

mitchb

Message:

Various tweaks to rails autoreloading code

o Don't watch all of public, as apps may cache files there and cause
  the fcgi to repeatedly die and destroy any fcgi performance gains
o Specifically watch .htaccess and dispatch.fcgi
o Raise an error to die instead of trying to reload code and dying
  in the process because you can't
o Explain that killing the fcgi process results in a reload of the code
  at the next request
(Merge of r1411:1486 from branches/locker-dev to trunk, originally from gdb)

File:

• trunk/locker/deploy/bin/rails (modified) (3 diffs, 1 prop)

trunk/locker/deploy/bin/rails

@@ -130 +130 @@
 
 t2 = Thread.new do
-   # List of directories to watch for changes before reload
-   Thread.current[:watched_dirs] = ['app', 'config', 'db', 'lib', 'public']
+   # List of directories to watch for changes before reload.
+   # You may want to also watch public or vendor, depending on your needs.
+   Thread.current[:watched_dirs] = ['app', 'config', 'db', 'lib']
+
+   # List of specific files to watch for changes.
+   Thread.current[:watched_files] = ['public/dispatch.fcgi',
+                                     'public/.htaccess']
    # Sample filter: /(\.rb|\.erb)\$/.  Default filter: watch all files
    Thread.current[:watched_extensions] = //
@@ -169 +174 @@
      Thread.current[:modifications] = {}
      Thread.current[:iterations] = 0
-     RailsFCGIHandler.reload!
+     # This is a kludge, but at the same time it works.
+     # Will kill the current FCGI process so that it is reloaded
+     # at next request.
+     raise RuntimeError
    end
 
@@ -175 +183 @@
    # Wait until the modify time changes, then reload.
    while true
-     reload if Thread.current[:watched_dirs].inject(false) {|z, dir| z || modified_dir(File.join(File.dirname(__FILE__), '..', dir))}
+     dir_modified = Thread.current[:watched_dirs].inject(false) {|z, dir| z || modified_dir(File.join(File.dirname(__FILE__), '..', dir))}
+     file_modified = Thread.current[:watched_files].inject(false) {|z, file| z || modified(File.join(File.dirname(__FILE__), '..', file))}
+     reload if dir_modified || file_modified
      Thread.current[:iterations] += 1
      sleep 1