diff --git a/falkordb-node/node-entrypoint.sh b/falkordb-node/node-entrypoint.sh index 01c7d61..81a1eea 100755 --- a/falkordb-node/node-entrypoint.sh +++ b/falkordb-node/node-entrypoint.sh @@ -143,16 +143,7 @@ handle_sigterm() { fi if [[ $RUN_SENTINEL -eq 1 && ! -z $sentinel_pid ]]; then - #kill -TERM $sentinel_pid - if [[ $TLS == "true" ]];then - redis-cli -p $SENTINEL_PORT -a $ADMIN_PASSWORD --no-auth-warning $TLS_CONNECTION_STRING SENTINEL FLUSHCONFIG - cat $NODE_CONF_FILE - redis-cli -p $SENTINEL_PORT -a $ADMIN_PASSWORD --no-auth-warning $TLS_CONNECTION_STRING SHUTDOWN - else - redis-cli -p $SENTINEL_PORT -a $ADMIN_PASSWORD SENTINEL FLUSHCONFIG - cat $NODE_CONF_FILE - redis-cli -p $SENTINEL_PORT -a $ADMIN_PASSWORD --no-auth-warning SHUTDOWN - fi + kill -TERM $sentinel_pid fi if [[ ! -z $falkordb_pid ]]; then @@ -466,6 +457,7 @@ if [[ "$RUN_SENTINEL" -eq "1" ]] && ([[ "$NODE_INDEX" == "0" || "$NODE_INDEX" == log "Master Name: $MASTER_NAME\Master Host: $FALKORDB_MASTER_HOST\Master Port: $FALKORDB_MASTER_PORT_NUMBER\nSentinel Quorum: $SENTINEL_QUORUM" wait_until_node_host_resolves $FALKORDB_MASTER_HOST $FALKORDB_MASTER_PORT_NUMBER redis-cli -p $SENTINEL_PORT --user $FALKORDB_USER -a $FALKORDB_PASSWORD --no-auth-warning $TLS_CONNECTION_STRING SENTINEL monitor $MASTER_NAME $FALKORDB_MASTER_HOST $FALKORDB_MASTER_PORT_NUMBER $SENTINEL_QUORUM + echo "I SHOULD NOT SEE THIS MESSAGE TWICE" redis-cli -p $SENTINEL_PORT --user $FALKORDB_USER -a $FALKORDB_PASSWORD --no-auth-warning $TLS_CONNECTION_STRING SENTINEL set $MASTER_NAME auth-pass $ADMIN_PASSWORD redis-cli -p $SENTINEL_PORT --user $FALKORDB_USER -a $FALKORDB_PASSWORD --no-auth-warning $TLS_CONNECTION_STRING SENTINEL set $MASTER_NAME failover-timeout $SENTINEL_FAILOVER redis-cli -p $SENTINEL_PORT --user $FALKORDB_USER -a $FALKORDB_PASSWORD --no-auth-warning $TLS_CONNECTION_STRING SENTINEL set $MASTER_NAME down-after-milliseconds $SENTINEL_DOWN_AFTER