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 21834dab26da3d1fc075d21ed42a7942806b868b..10581a697e3bb498c06f9ef2cefbac34916216e0 100644 (file)
--- 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)
        }()