Merge pull request #7295 from dokku/fix-proxy-logs-again

Respect the exit code and pass flags correctly when tailing nginx logs on k3s

plugins/nginx-vhosts/functions

@@ -85,6 +85,7 @@ nginx_logs() {
   local DOKKU_SCHEDULER=$(get_app_scheduler "$APP")
   if [[ "$DOKKU_SCHEDULER" != "docker-local" ]]; then
     plugn trigger scheduler-proxy-logs "$DOKKU_SCHEDULER" "$APP" "nginx" "$NGINX_LOGS_TYPE" "$tail" "$num"
+    return $?
   fi
 
   if [[ "$tail" == "true" ]]; then

plugins/scheduler-k3s/triggers.go

@@ -866,7 +866,8 @@ func TriggerSchedulerProxyLogs(scheduler string, appName string, proxyType strin
 		command = append(command, "-F")
 	}
 	if numLines > 0 {
-		command = append(command, fmt.Sprintf("-n %d", numLines))
+		command = append(command, "-n")
+		command = append(command, strconv.FormatInt(numLines, 10))
 	}
 	command = append(command, filename)