Skip to content

Ignore stdout & stderr logs and log warning #973

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
aphralG merged 5 commits into from
Feb 10, 2025
Merged

Ignore stdout & stderr logs and log warning #973

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
71fa342
add warning and exclude stdout and stderr
aphralG Feb 5, 2025
e881bd2
Merge branch 'v3' into error-log-stdout-log-warning
aphralG Feb 5, 2025
b4d2416
add warning and exclude stdout and stderr
aphralG Feb 5, 2025
9dd1e5d
Merge branch 'v3' into error-log-stdout-log-warning
aphralG Feb 10, 2025
d8d728e
clean up
aphralG Feb 10, 2025
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
6 changes: 5 additions & 1 deletion internal/watcher/instance/nginx_config_parser.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,10 @@ func (ncp *NginxConfigParser) createNginxConfigContext(
if !ncp.ignoreLog(directive.Args[0]) {
errorLog := ncp.errorLog(directive.Args[0], ncp.errorLogDirectiveLevel(directive))
nginxConfigContext.ErrorLogs = append(nginxConfigContext.ErrorLogs, errorLog)
} else {
slog.WarnContext(ctx, fmt.Sprintf("Currently error log outputs to %s. Log monitoring "+
"is disabled while applying a config; "+"log errors to file to enable error monitoring",
directive.Args[0]), "error_log", directive.Args[0])
}
case "root":
rootFiles := ncp.rootFiles(ctx, directive.Args[0])
Expand Down Expand Up @@ -185,7 +189,7 @@ func (ncp *NginxConfigParser) createNginxConfigContext(

func (ncp *NginxConfigParser) ignoreLog(logPath string) bool {
logLower := strings.ToLower(logPath)
ignoreLogs := []string{"off", "/dev/stderr", "/dev/stdout", "/dev/null"}
ignoreLogs := []string{"off", "/dev/stderr", "/dev/stdout", "/dev/null", "stderr", "stdout"}

if strings.HasPrefix(logLower, "syslog:") || slices.Contains(ignoreLogs, logLower) {
return true
Expand Down
14 changes: 14 additions & 0 deletions internal/watcher/instance/nginx_config_parser_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -927,6 +927,20 @@ func TestNginxConfigParser_ignoreLog(t *testing.T) {
expected: false,
expectedLog: "Log being read is outside of allowed directories",
},
{
name: "Test 10: log stderr",
logPath: "stderr",
excludeLogs: []string{},
expected: true,
expectedLog: "",
},
{
name: "Test 11: log stdout",
logPath: "stdout",
excludeLogs: []string{},
expected: true,
expectedLog: "",
},
}

for _, test := range tests {
Expand Down