Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix logging of stdout for agency nodes (#6377) 

also capture stderr as originally intended (was not logged)
This commit is contained in:
Jan 2018-09-05 13:48:25 +02:00 committed by GitHub
parent db2cdc891c
commit 89dcafd156
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
scripts/startLeaderFollower.sh
View File

@ -129,31 +129,31 @@ fi
echo Starting agency ... echo Starting agency ...
for aid in `seq 0 $(( $NRAGENTS - 1 ))`; do for aid in `seq 0 $(( $NRAGENTS - 1 ))`; do
port=$(( $AG_BASE + $aid )) PORT=$(( $AG_BASE + $aid ))
AGENCY_ENDPOINTS+="--cluster.agency-endpoint $TRANSPORT://$ADDRESS:$port " AGENCY_ENDPOINTS+="--cluster.agency-endpoint $TRANSPORT://$ADDRESS:$PORT "
$ARANGOD \ $ARANGOD \
-c none \ -c none \
--agency.activate true \ --agency.activate true \
--agency.compaction-step-size $COMP \ --agency.compaction-step-size $COMP \
--agency.compaction-keep-size $KEEP \ --agency.compaction-keep-size $KEEP \
--agency.endpoint $TRANSPORT://$ENDPOINT:$AG_BASE \ --agency.endpoint $TRANSPORT://$ENDPOINT:$AG_BASE \
--agency.my-address $TRANSPORT://$ADDRESS:$port \ --agency.my-address $TRANSPORT://$ADDRESS:$PORT \
--agency.pool-size $NRAGENTS \ --agency.pool-size $NRAGENTS \
--agency.size $NRAGENTS \ --agency.size $NRAGENTS \
--agency.supervision true \ --agency.supervision true \
--agency.supervision-frequency $SFRE \ --agency.supervision-frequency $SFRE \
--agency.supervision-grace-period 5.0 \ --agency.supervision-grace-period 5.0 \
--agency.wait-for-sync false \ --agency.wait-for-sync false \
--database.directory active/data$port \ --database.directory active/data$PORT \
--javascript.enabled false \ --javascript.enabled false \
--server.endpoint $TRANSPORT://$ENDPOINT:$port \ --server.endpoint $TRANSPORT://$ENDPOINT:$PORT \
--server.statistics false \ --server.statistics false \
--log.file active/$port.log \ --log.file active/$PORT.log \
--log.level $LOG_LEVEL_AGENCY \ --log.level $LOG_LEVEL_AGENCY \
$STORAGE_ENGINE \ $STORAGE_ENGINE \
$AUTHENTICATION \ $AUTHENTICATION \
$SSLKEYFILE \ $SSLKEYFILE \
| tee active/$PORT.stdout 2>&1 & 2>&1 | tee active/$PORT.stdout &
done done
start() { start() {
@ -182,7 +182,7 @@ start() {
$STORAGE_ENGINE \ $STORAGE_ENGINE \
$AUTHENTICATION \ $AUTHENTICATION \
$SSLKEYFILE \ $SSLKEYFILE \
| tee active/$PORT.stdout 2>&1 & 2>&1 | tee active/$PORT.stdout &
} }
PORTTOPDB=`expr $SS_BASE + $NRSINGLESERVERS - 1` PORTTOPDB=`expr $SS_BASE + $NRSINGLESERVERS - 1`

16
scripts/startLocalCluster.sh
View File

@ -131,33 +131,33 @@ fi
echo == Starting agency ... echo == Starting agency ...
for aid in `seq 0 $(( $NRAGENTS - 1 ))`; do for aid in `seq 0 $(( $NRAGENTS - 1 ))`; do
[ "$INTERACTIVE_MODE" == "R" ] && sleep 1 [ "$INTERACTIVE_MODE" == "R" ] && sleep 1
port=$(( $AG_BASE + $aid )) PORT=$(( $AG_BASE + $aid ))
AGENCY_ENDPOINTS+="--cluster.agency-endpoint $TRANSPORT://$ADDRESS:$port " AGENCY_ENDPOINTS+="--cluster.agency-endpoint $TRANSPORT://$ADDRESS:$PORT "
$ARANGOD \ $ARANGOD \
-c none \ -c none \
--agency.activate true \ --agency.activate true \
--agency.compaction-step-size $COMP \ --agency.compaction-step-size $COMP \
--agency.compaction-keep-size $KEEP \ --agency.compaction-keep-size $KEEP \
--agency.endpoint $TRANSPORT://$ENDPOINT:$AG_BASE \ --agency.endpoint $TRANSPORT://$ENDPOINT:$AG_BASE \
--agency.my-address $TRANSPORT://$ADDRESS:$port \ --agency.my-address $TRANSPORT://$ADDRESS:$PORT \
--agency.pool-size $NRAGENTS \ --agency.pool-size $NRAGENTS \
--agency.size $NRAGENTS \ --agency.size $NRAGENTS \
--agency.supervision true \ --agency.supervision true \
--agency.supervision-frequency $SFRE \ --agency.supervision-frequency $SFRE \
--agency.supervision-grace-period 5.0 \ --agency.supervision-grace-period 5.0 \
--agency.wait-for-sync false \ --agency.wait-for-sync false \
--database.directory cluster/data$port \ --database.directory cluster/data$PORT \
--javascript.enabled false \ --javascript.enabled false \
--server.endpoint $TRANSPORT://$ENDPOINT:$port \ --server.endpoint $TRANSPORT://$ENDPOINT:$PORT \
--server.statistics false \ --server.statistics false \
--log.file cluster/$port.log \ --log.file cluster/$PORT.log \
--log.force-direct true \ --log.force-direct true \
--log.level $LOG_LEVEL_AGENCY \ --log.level $LOG_LEVEL_AGENCY \
--javascript.allow-admin-execute true \ --javascript.allow-admin-execute true \
$STORAGE_ENGINE \ $STORAGE_ENGINE \
$AUTHENTICATION \ $AUTHENTICATION \
$SSLKEYFILE \ $SSLKEYFILE \
| tee cluster/$PORT.stdout 2>&1 & 2>&1 | tee cluster/$PORT.stdout &
done done
start() { start() {
@ -198,7 +198,7 @@ start() {
$STORAGE_ENGINE \ $STORAGE_ENGINE \
$AUTHENTICATION \ $AUTHENTICATION \
$SSLKEYFILE \ $SSLKEYFILE \
| tee cluster/$PORT.stdout 2>&1 & 2>&1 | tee cluster/$PORT.stdout &
} }
PORTTOPDB=`expr $DB_BASE + $NRDBSERVERS - 1` PORTTOPDB=`expr $DB_BASE + $NRDBSERVERS - 1`