perl-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Fred Moyer <f...@redhotpenguin.com>
Subject Fwd: svn commit: r980971 - in /perl/Apache-Reload/trunk: Changes lib/Apache/Reload.pm lib/Apache2/Reload.pm
Date Fri, 30 Jul 2010 21:35:04 GMT
Patch applied after some back and forth off list to get me the
patchfile - I think something in my toolchain was mangling it.

Thanks for bringing that up again.  I'll have the RC out in the next few days.

---------- Forwarded message ----------
From:  <phred@apache.org>
Date: Fri, Jul 30, 2010 at 2:32 PM
Subject: svn commit: r980971 - in /perl/Apache-Reload/trunk: Changes
lib/Apache/Reload.pm lib/Apache2/Reload.pm
To: modperl-cvs@perl.apache.org


Author: phred
Date: Fri Jul 30 21:32:17 2010
New Revision: 980971

URL: http://svn.apache.org/viewvc?rev=980971&view=rev
Log:
Ignore require-hooks which exist in %INC
Reloads by file, not module name

Submitted by:  Ryan Gies
Reviewed by:  Gozer
Applied by:  Phred

Modified:
   perl/Apache-Reload/trunk/Changes
   perl/Apache-Reload/trunk/lib/Apache/Reload.pm
   perl/Apache-Reload/trunk/lib/Apache2/Reload.pm

Modified: perl/Apache-Reload/trunk/Changes
URL: http://svn.apache.org/viewvc/perl/Apache-Reload/trunk/Changes?rev=980971&r1=980970&r2=980971&view=diff
==============================================================================
--- perl/Apache-Reload/trunk/Changes (original)
+++ perl/Apache-Reload/trunk/Changes Fri Jul 30 21:32:17 2010
@@ -8,6 +8,12 @@ Changes - Apache::Reload change logfile

 =item 0.11-dev

+Ignore require-hooks which exist in %INC
+[Ryan Gies <ryan@livesite.net>]
+
+Reloads by file, not module name
+[Ryan Gies <ryan@livesite.net>]
+
 Add a no Apache::Reload directive which skips reloading for modules
 that have it included (useful for Moose compatibility).
 [Graham Barr, <gbarr@pobox.com>]

Modified: perl/Apache-Reload/trunk/lib/Apache/Reload.pm
URL: http://svn.apache.org/viewvc/perl/Apache-Reload/trunk/lib/Apache/Reload.pm?rev=980971&r1=980970&r2=980971&view=diff
==============================================================================
--- perl/Apache-Reload/trunk/lib/Apache/Reload.pm (original)
+++ perl/Apache-Reload/trunk/lib/Apache/Reload.pm Fri Jul 30 21:32:17 2010
@@ -17,7 +17,7 @@ package Apache::Reload;

 use strict;

-$Apache::Reload::VERSION = '0.11';
+$Apache::Reload::VERSION = '0.11-dev';

 use vars qw(%INCS %Stat $TouchTime %UndefFields);


Modified: perl/Apache-Reload/trunk/lib/Apache2/Reload.pm
URL: http://svn.apache.org/viewvc/perl/Apache-Reload/trunk/lib/Apache2/Reload.pm?rev=980971&r1=980970&r2=980971&view=diff
==============================================================================
--- perl/Apache-Reload/trunk/lib/Apache2/Reload.pm (original)
+++ perl/Apache-Reload/trunk/lib/Apache2/Reload.pm Fri Jul 30 21:32:17 2010
@@ -20,7 +20,7 @@ use warnings FATAL => 'all';

 use mod_perl2;

-our $VERSION = '0.11';
+our $VERSION = '0.12';

 use Apache2::Const -compile => qw(OK);

@@ -86,6 +86,8 @@ sub handler {

    my $DEBUG = ref($o) && (lc($o->dir_config("ReloadDebug") || '') eq 'on');

+    my $ReloadByModuleName = ref($o) &&
(lc($o->dir_config("ReloadByModuleName") || '') eq 'on');
+
    my $TouchFile = ref($o) && $o->dir_config("ReloadTouchFile");

    my $ConstantRedefineWarnings = ref($o) &&
@@ -138,6 +140,7 @@ sub handler {
        my $file = $Apache2::Reload::INCS{$key};

        next unless defined $file;
+        next if ref $file;
        next if @watch_dirs && !grep { $file =~ /^$_/ } @watch_dirs;
        warn "Apache2::Reload: Checking mtime of $key\n" if $DEBUG;

@@ -158,24 +161,29 @@ sub handler {
        }

        if ($mtime > $Stat{$file}) {
-            push @changed, $key;
+            push @changed, [$key, $file];
        }
        $Stat{$file} = $mtime;
    }

    #First, let's unload all changed modules
-    foreach my $module (@changed) {
+    foreach my $change (@changed) {
+        my ($module, $file) = @$change;
        my $package = module_to_package($module);
        ModPerl::Util::unload_package($package);
    }
-
+
    #Then, let's reload them all, so that module dependencies can satisfy
    #themselves in the correct order.
-    foreach my $module (@changed) {
-        my $package = module_to_package($module);
-        require $module;
-        warn("Apache2::Reload: process $$ reloading $package from $module\n")
-            if $DEBUG;
+    foreach my $change (@changed) {
+        my ($module, $file) = @$change;
+        my $name = $ReloadByModuleName ? $module : $file;
+        require $name;
+        if ($DEBUG) {
+          my $package = module_to_package($module);
+          warn sprintf("Apache2::Reload: process %d reloading %s from %s\n",
+            $$, $package, $name);
+        }
    }

    return Apache2::Const::OK;
@@ -206,6 +214,7 @@ Apache2::Reload - Reload Perl Modules wh
  PerlSetVar ReloadAll Off
  PerlSetVar ReloadModules "ModPerl::* Apache2::*"
  #PerlSetVar ReloadDebug On
+  #PerlSetVar ReloadByModuleName On

  # Reload a single module from within itself:
  package My::Apache2::Module;
@@ -226,16 +235,28 @@ modules that have registered themselves
 also do the check for modified modules, when a special touch-file has
 been modified.

-Note that C<Apache2::Reload> operates on the current context of
-C<@INC>.  Which means, when called as a C<Perl*Handler> it will not
-see C<@INC> paths added or removed by C<ModPerl::Registry> scripts, as
-the value of C<@INC> is saved on server startup and restored to that
-value after each request.  In other words, if you want
-C<Apache2::Reload> to work with modules that live in custom C<@INC>
-paths, you should modify C<@INC> when the server is started.  Besides,
-C<'use lib'> in the startup script, you can also set the C<PERL5LIB>
-variable in the httpd's environment to include any non-standard 'lib'
-directories that you choose.  For example, to accomplish that you can
+Require-hooks, i.e., entries in %INC which are references, are ignored.  The
+hook should modify %INC itself, adding the path to the module file, for it to
+be reloaded.
+
+C<Apache2::Reload> inspects and reloads the B<file> associated with a given
+module.  Changes to @INC are not recognized, as it is the file which is
+being re-required, not the module name.
+
+In version 0.10 and earlier the B<module name>, not the file, is re-required.
+Meaning it operated on the the current context of @INC.  If you still want this
+behavior set this environment variable in I<httpd.conf>:
+
+  PerlSetVar ReloadByModuleName On
+
+This means, when called as a C<Perl*Handler>, C<Apache2::Reload> will not see
+C<@INC> paths added or removed by C<ModPerl::Registry> scripts, as the value
of
+C<@INC> is saved on server startup and restored to that value after each
+request.  In other words, if you want C<Apache2::Reload> to work with modules
+that live in custom C<@INC> paths, you should modify C<@INC> when the server
is
+started.  Besides, C<'use lib'> in the startup script, you can also set the
+C<PERL5LIB> variable in the httpd's environment to include any non-standard
+'lib' directories that you choose.  For example, to accomplish that you can
 include a line:

  PERL5LIB=/home/httpd/perl/extra; export PERL5LIB

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@perl.apache.org
For additional commands, e-mail: dev-help@perl.apache.org


Mime
View raw message