[Rt-commit] rt branch, master, updated. rt-4.0.0rc4-81-g12a84e1

[Alex Vandiver]

The branch, master has been updated
       via  12a84e128e8441cca119810a2a19e5d9c5104883 (commit)
       via  9ee4377b16836db11f29c8cd9456c1abfa00a4bd (commit)
      from  7918101153e40e0eb4803c578fd6cb2294b76222 (commit)

Summary of changes:
 docs/UPGRADING-4.2                       |    6 ++++++
 etc/RT_Config.pm.in                      |    4 ++--
 etc/upgrade/generate-rtaddressregexp.in  |    2 +-
 etc/upgrade/shrink_cgm_table.pl          |    2 +-
 etc/upgrade/shrink_transactions_table.pl |    2 +-
 etc/upgrade/split-out-cf-categories.in   |    4 ++--
 lib/RT.pm                                |    4 ++--
 lib/RT/Config.pm                         |   25 ++++++++++++++++++++++++-
 lib/RT/Test.pm                           |    2 +-
 t/approval/admincc.t                     |    2 +-
 t/approval/basic.t                       |    2 +-
 t/shredder/utils.pl                      |    2 +-
 12 files changed, 43 insertions(+), 14 deletions(-)
 create mode 100644 docs/UPGRADING-4.2

- Log -----------------------------------------------------------------
commit 12a84e128e8441cca119810a2a19e5d9c5104883
Merge: 7918101 9ee4377
Author: Alex Vandiver <alexmv at bestpractical.com>
Date:   Tue Feb 15 14:06:12 2011 -0500

    Merge branch '4.2/rename-LogToScreen'
    
    Conflicts:
    	docs/UPGRADING-4.0
    	lib/RT/Config.pm

diff --cc docs/UPGRADING-4.2
index 0000000,0000000..66af083
new file mode 100644
--- /dev/null
+++ b/docs/UPGRADING-4.2
@@@ -1,0 -1,0 +1,6 @@@
++UPGRADING FROM RT 4.0.0 and greater
++
++* The $LogToScreen config setting is now named $LogToSTDERR which better
++  describes what the log level controls.  Setting $LogToScreen will still work,
++  but an informational notice will be issued on server start telling you about
++  the rename.  To avoid this you should set $LogToSTDERR instead.
diff --cc lib/RT/Config.pm
index cf24a02,ca9cdb6..95e0a01
--- a/lib/RT/Config.pm
+++ b/lib/RT/Config.pm
@@@ -536,34 -541,22 +541,50 @@@ our %META = 
                                'You can change the site default in your %Lifecycles config.');
          }
      },
 +    EmailInputEncodings => {
 +        Type => 'ARRAY',
 +        PostLoadCheck => sub {
 +            my $self  = shift;
 +            my $value = $self->Get('EmailInputEncodings');
 +            return unless $value && @$value;
 +
 +            my %seen;
 +            foreach my $encoding ( grep defined && length, splice @$value ) {
 +                next if $seen{ $encoding }++;
 +                if ( $encoding eq '*' ) {
 +                    unshift @$value, '*';
 +                    next;
 +                }
 +
 +                my $canonic = Encode::resolve_alias( $encoding );
 +                unless ( $canonic ) {
 +                    warn "Unknown encoding '$encoding' in \@EmailInputEncodings option";
 +                }
 +                elsif ( $seen{ $canonic }++ ) {
 +                    next;
 +                }
 +                else {
 +                    push @$value, $canonic;
 +                }
 +            }
 +        },
-     }
++    },
+     LogToScreen => {
+         PostSet => sub {
+             my $self  = shift;
+             my $value = shift;
+             $self->SetFromConfig(
+                 Option => \'LogToSTDERR',
+                 Value  => [$value],
+                 %{$self->Meta('LogToScreen')->{'Source'}}
+             );
+         },
+         PostLoadCheck => sub {
+             my $self = shift;
+             $RT::Logger->info("You set \$LogToScreen in your config, but it's been renamed to \$LogToSTDERR.  Please update your config.")
+                 if $self->Meta('LogToScreen')->{'Source'}{'Package'};
+         },
+     },
  );
  my %OPTIONS = ();
  

-----------------------------------------------------------------------