Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Actually fix the freeze up caused by security scanners. #925

Merged
merged 2 commits into from
Sep 25, 2021
Merged

Actually fix the freeze up caused by security scanners. #925

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
558d719
Actually fix the freeze up caused by security scanners.
henry54809 Sep 24, 2021
85ea06e
stderr too
henry54809 Sep 24, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion cmd/faucet
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,14 +104,15 @@ if [[ -n $native ]]; then
[ -f $RYU_CONF ] || (echo $RYU_CONF not found.; exit 1)
export ${PREFIX}_EXCEPTION_LOG=$RUNTIME/${BASECMD}_exception.log
export ${PREFIX}_PROMETHEUS_PORT=${prom_pt:-$PROM_TARGET}
export ${PREFIX}_PROMETHEUS_ADDR=localhost
export ${PREFIX}_CONFIG=$RUNTIME/$BASECMD.yaml
export ${PREFIX}_EVENT_SOCK=$RUNTIME/$FAUCET_SOCK
export ${PREFIX}_CONFIG_STAT_RELOAD=1
export RYU_LISTEN_PORT=$ext_ofpt
export WSAPI_LISTEN_PORT=4567
echo Launching $BASECMD $RYU_LISTEN_PORT $FAUCET_PROMETHEUS_PORT $WSAPI_LISTEN_PORT
env | fgrep ${PREFIX}_
$BASECMD --ryu-config-file=$RYU_CONF --ryu-ofp-tcp-listen-port=$RYU_LISTEN_PORT --ryu-wsapi-port=$WSAPI_LISTEN_PORT --ryu-wsapi-host=localhost --ryu-ofp-listen-host=localhost &
$BASECMD --ryu-config-file=$RYU_CONF --ryu-ofp-tcp-listen-port=$RYU_LISTEN_PORT --ryu-wsapi-port=$WSAPI_LISTEN_PORT --ryu-wsapi-host=localhost --ryu-ofp-listen-host=localhost > /dev/null &
echo $! > $PID_FILE
echo Started $BASECMD pid $(< $PID_FILE)
else
Expand Down