[Rt-commit] rt branch, 4.2/serializer-deprecation-updates, updated. rt-4.2.1-159-g4a96dcf

[Alex Vandiver]

The branch, 4.2/serializer-deprecation-updates has been updated
       via  4a96dcf9eae6dbdfd9a2f38bfc8eb8f758d0ed34 (commit)
       via  d8538b2bfb9e4a6ccfd87f002d01d6c2d4b49d50 (commit)
      from  511f6c62ab0c50e564840ba0da7302df3afdb676 (commit)

Summary of changes:
 lib/RT/Migrate.pm | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

- Log -----------------------------------------------------------------
commit d8538b2bfb9e4a6ccfd87f002d01d6c2d4b49d50
Author: Alex Vandiver <alexmv at bestpractical.com>
Date:   Thu Jan 2 15:42:04 2014 -0500

    Remove unnecessary 3.8-compat logic
    
    892d3721 included logic to work on RT 3.8-style configurations, because
    the commit was also destined for RTx-Migrate, which must fon on earlier
    version of RT.  Such logic is unnecessary in core RT; remove it.

diff --git a/lib/RT/Migrate.pm b/lib/RT/Migrate.pm
index c87b466..baf28ef 100644
--- a/lib/RT/Migrate.pm
+++ b/lib/RT/Migrate.pm
@@ -177,19 +177,11 @@ sub setup_logging {
     my ($dir, $file) = @_;
 
 
-    if ( RT->can('Config') && RT->Config->can('Set') ) {
-        RT->Config->Set(LogToScreen    => 'warning');
-        RT->Config->Set(LogToFile      => 'warning');
-        RT->Config->Set(LogDir         => $dir);
-        RT->Config->Set(LogToFileNamed => $file);
-        RT->Config->Set(LogStackTraces => 'error');
-    } else { # running before 3.8
-        $RT::LogToScreen    = 'warning';
-        $RT::LogToFile      = 'warning';
-        $RT::LogDir         = $dir;
-        $RT::LogToFileNamed = $file;
-        $RT::LogStackTraces = 'error';
-    }
+    RT->Config->Set(LogToScreen    => 'warning');
+    RT->Config->Set(LogToFile      => 'warning');
+    RT->Config->Set(LogDir         => $dir);
+    RT->Config->Set(LogToFileNamed => $file);
+    RT->Config->Set(LogStackTraces => 'error');
 
     undef $RT::Logger;
     RT->InitLogging();

commit 4a96dcf9eae6dbdfd9a2f38bfc8eb8f758d0ed34
Author: Alex Vandiver <alexmv at bestpractical.com>
Date:   Thu Jan 2 15:43:48 2014 -0500

    Switch from te deprecated LogToScreen to LogtoSTDERR

diff --git a/lib/RT/Migrate.pm b/lib/RT/Migrate.pm
index baf28ef..991b997 100644
--- a/lib/RT/Migrate.pm
+++ b/lib/RT/Migrate.pm
@@ -177,7 +177,7 @@ sub setup_logging {
     my ($dir, $file) = @_;
 
 
-    RT->Config->Set(LogToScreen    => 'warning');
+    RT->Config->Set(LogToSTDERR    => 'warning');
     RT->Config->Set(LogToFile      => 'warning');
     RT->Config->Set(LogDir         => $dir);
     RT->Config->Set(LogToFileNamed => $file);

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