[Rt-commit] rt branch, 4.2/auto-reload-config, updated. rt-4.0.4-364-gb7ceceb

[? sunnavy]

The branch, 4.2/auto-reload-config has been updated
       via  b7ceceb623da8382edec9979fb56e5e9e5f765e0 (commit)
      from  783028677112f95397ff5112a5bde277d4f308a1 (commit)

Summary of changes:
 sbin/rt-server.in |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

- Log -----------------------------------------------------------------
commit b7ceceb623da8382edec9979fb56e5e9e5f765e0
Author: sunnavy <sunnavy at bestpractical.com>
Date:   Fri Jan 20 03:03:21 2012 +0800

    don't try to restart server in install mode
    
    because we write config several times during the install wizard

diff --git a/sbin/rt-server.in b/sbin/rt-server.in
index c1c05e2..fa77987 100755
--- a/sbin/rt-server.in
+++ b/sbin/rt-server.in
@@ -209,7 +209,7 @@ else {
 push @args, '--server', 'Standalone' if RT->InstallMode;
 push @args, '--server', 'Starlet' unless $r->{server} || grep { m/--server/ } @args;
 
-if ( RT->Config->Get('DevelMode') ) {
+if ( !RT->InstallMode && RT->Config->Get('DevelMode')  ) {
     my %config = RT->Config->LoadedConfigs();
     push @args, '-R', join ',', values %config;
 
@@ -231,7 +231,7 @@ unless ($r->{env} eq 'development') {
     };
 }
 
-if ( RT->Config->Get('DevelMode') ) {
+if ( !RT->InstallMode && RT->Config->Get('DevelMode')  ) {
     eval {
         $r->run(
             sub {

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