Changeset 1488 in genappalpha for bin/genapp_mkappconfig


Ignore:
Timestamp:
Jul 10, 2018, 10:13:55 AM (4 years ago)
Author:
ehb
Message:

fixes for install with tcp messaging

File:
1 edited

Legend:

Unmodified
Added
Removed
  • bin/genapp_mkappconfig

    r1402 r1488  
    239239    $$json{ "messaging" }{ "tcphostip" } = $$cfgjson{ "messaging" }{ "tcphostip" } || die "$0 tcphostip not defined in $cfgjsonf. $cfgjsonnotes";
    240240    $$json{ "messaging" }{ "tcpport" }   = $$cfgjson{ "messaging" }{ "tcpport" } || die "$0 tcpport not defined in $cfgjsonf. $cfgjsonnotes";
     241    $$json{ "messaging" }{ "tcprport" }  = $$cfgjson{ "messaging" }{ "tcprport" } || die "$0 tcprport not defined in $cfgjsonf. $cfgjsonnotes";
     242    $$json{ "messaging" }{ "tcptimeout" }  = $$cfgjson{ "messaging" }{ "tcptimeout" } || die "$0 tcptimeout not defined in $cfgjsonf. $cfgjsonnotes";
    241243
    242244    $$json{ "restricted" }{ "admin" } = ( $admin ) if $admin;
     
    330332        $changes .= "messaging:tcpport updated from [$$appjson{'messaging'}{'tcpport'}] to [$$cfgjson{'messaging'}{'tcpport'}]\n";
    331333        $$appjson{ 'messaging' }{ 'tcpport' } = $$cfgjson{ 'messaging' }{ 'tcpport' };
     334    }
     335
     336    die "$0 tcprport not defined in $cfgjsonf. $cfgjsonnotes" if !$$cfgjson{ 'messaging' }{ 'tcprport' };
     337    if ( $$appjson{ 'messaging' }{ 'tcprport' } ne $$cfgjson{ 'messaging' }{ 'tcprport' } ) {
     338        $changes .= "messaging:tcprport updated from [$$appjson{'messaging'}{'tcprport'}] to [$$cfgjson{'messaging'}{'tcprport'}]\n";
     339        $$appjson{ 'messaging' }{ 'tcprport' } = $$cfgjson{ 'messaging' }{ 'tcprport' };
     340    }
     341
     342    die "$0 tcptimeout not defined in $cfgjsonf. $cfgjsonnotes" if !$$cfgjson{ 'messaging' }{ 'tcptimeout' };
     343    if ( $$appjson{ 'messaging' }{ 'tcptimeout' } ne $$cfgjson{ 'messaging' }{ 'tcptimeout' } ) {
     344        $changes .= "messaging:tcptimeout updated from [$$appjson{'messaging'}{'tcptimeout'}] to [$$cfgjson{'messaging'}{'tcptimeout'}]\n";
     345        $$appjson{ 'messaging' }{ 'tcptimeout' } = $$cfgjson{ 'messaging' }{ 'tcptimeout' };
    332346    }
    333347
Note: See TracChangeset for help on using the changeset viewer.