Skip to content

nginx: fix ls-redirection, mute non-errors in validate-all, and set unique intervals for monitor actions #2094

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

Merged
merged 1 commit into from
Nov 5, 2025
Merged

nginx: fix ls-redirection, mute non-errors in validate-all, and set unique intervals for monitor actions #2094

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 7 additions & 7 deletions heartbeat/nginx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,7 @@ nginxcat() {
close(cmd);
}
function listfiles(pattern, cmd,f) {
cmd="ls "pattern" 2>/dev/null";
cmd="ls "pattern;
while( ( cmd | getline f ) > 0 ) {
printfile(f);
}
Expand All @@ -271,7 +271,7 @@ nginxcat() {
return !system("test -d \""s"\"");
}
{ procline(); }
' $1 |
' $1 2> /dev/null |
sed 's/#.*//;s/[[:blank:]]*$//;s/^[[:blank:]]*//' |
grep -v '^$'
}
Expand Down Expand Up @@ -800,8 +800,8 @@ Extra options to apply when starting nginx.
<action name="status" timeout="30s" />
<action name="monitor" timeout="30s" depth="0" interval="10s" />
<action name="monitor" timeout="30s" depth="10" interval="30s" />
<action name="monitor" timeout="45s" depth="20" />
<action name="monitor" timeout="60s" depth="30" />
<action name="monitor" timeout="45s" depth="20" interval="60s" />
<action name="monitor" timeout="60s" depth="30" interval="61s" />
<action name="meta-data" timeout="5s" />
<action name="validate-all" timeout="5s" />
</actions>
Expand Down Expand Up @@ -847,11 +847,11 @@ validate_all_nginx() {
exit $OCF_ERR_CONFIGURED
fi
if
ocf_run $NGINXD $OPTIONS -t -c $CONFIGFILE
ocf_run $NGINXD $OPTIONS -q -t -c $CONFIGFILE
then
: Cool $NGINXD likes $CONFIGFILE
else
ocf_exit_reason "$NGINXD $OPTIONS -t -c $CONFIGFILE reported a configuration error."
ocf_exit_reason "$NGINXD $OPTIONS -q -t -c $CONFIGFILE reported a configuration error."
return $OCF_ERR_CONFIGURED
fi
return $OCF_SUCCESS
Expand Down Expand Up @@ -908,7 +908,7 @@ then
if
[ ! -z "$OCF_RESKEY_httpd" ]
then
ocf_log info "Using $NGINXD as nginx"
ocf_log debug "Using $NGINXD as nginx"
fi
fi

Expand Down