From: Tom Clegg <tom@tomclegg.ca>
Date: Mon, 24 Feb 2020 20:26:45 +0000 (-0500)
Subject: 15954: Show passenger logs.
X-Git-Tag: 2.1.0~273^2~35
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/ce014b06b594d9d368187189ac01b41a238e54e1?hp=8ebed6625b925e1ae5c18b162560f37308335bad

15954: Show passenger logs.

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom@tomclegg.ca>
---

diff --git a/lib/boot/passenger.go b/lib/boot/passenger.go
index 21834dab26..10581a697e 100644
--- a/lib/boot/passenger.go
+++ b/lib/boot/passenger.go
@@ -90,13 +90,27 @@ func (runner runPassenger) Run(ctx context.Context, fail func(error), boot *Boot
 	if err != nil {
 		return fmt.Errorf("bug: no InternalURLs for component %q: %v", runner, runner.svc.InternalURLs)
 	}
+	loglevel := "4"
+	if lvl, ok := map[string]string{
+		"debug":   "5",
+		"info":    "4",
+		"warn":    "2",
+		"warning": "2",
+		"error":   "1",
+		"fatal":   "0",
+		"panic":   "0",
+	}[boot.cluster.SystemLogs.LogLevel]; ok {
+		loglevel = lvl
+	}
 	boot.waitShutdown.Add(1)
 	go func() {
 		defer boot.waitShutdown.Done()
 		err = boot.RunProgram(ctx, runner.src, nil, nil, "bundle", "exec",
 			"passenger", "start",
 			"-p", port,
-			"--log-file", "/dev/null",
+			"--log-file", "/dev/stderr",
+			"--log-level", loglevel,
+			"--no-friendly-error-pages",
 			"--pid-file", filepath.Join(boot.tempdir, "passenger."+strings.Replace(runner.src, "/", "_", -1)+".pid"))
 		fail(err)
 	}()