[Rt-commit] rt branch, master, updated. rt-4.1.17-141-g5bf56e8

[Alex Vandiver]

The branch, master has been updated
       via  5bf56e84a5b2d56d32caf4479ef4a5ddb6321cc5 (commit)
       via  33eaf0812baad68e4e59a27e4c35a97876f0a7cd (commit)
      from  5e811286e990d4f38ae54d97955d120dc17fbcac (commit)

Summary of changes:
 sbin/rt-setup-database.in | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

- Log -----------------------------------------------------------------
commit 5bf56e84a5b2d56d32caf4479ef4a5ddb6321cc5
Merge: 5e81128 33eaf08
Author: Alex Vandiver <alexmv at bestpractical.com>
Date:   Fri Jul 26 22:43:51 2013 -0400

    Merge branch '4.2/init-log-in-setup-database-earlier'
    
    Conflicts:
    	sbin/rt-setup-database.in

diff --cc sbin/rt-setup-database.in
index 05d0364,dc2161d..02a8dc7
--- a/sbin/rt-setup-database.in
+++ b/sbin/rt-setup-database.in
@@@ -99,9 -97,10 +99,10 @@@ RT->InitClasses()
  
  # Force warnings to be output to STDERR if we're not already logging
  # them at a higher level
 -RT->Config->Set( LogToScreen => 'warning')
 -    unless ( RT->Config->Get( 'LogToScreen' )
 -             && RT->Config->Get( 'LogToScreen' ) =~ /^(debug|info|notice)$/ );
 +RT->Config->Set( LogToSTDERR => 'warning')
 +    unless ( RT->Config->Get( 'LogToSTDERR' )
 +             && RT->Config->Get( 'LogToSTDERR' ) =~ /^(debug|info|notice)$/ );
+ RT::InitLogging();
  
  # get customized root password
  my $root_password;

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