15954: Don't send copious "rake test" logs to stdout.

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

diff --git a/apps/workbench/config/application.rb b/apps/workbench/config/application.rb
index 2d331c70ad3a13941f933ab09b054fcdf4cd504e..e88229b85158f200ebc6a7df644f9b147fcfd06f 100644 (file)
--- a/apps/workbench/config/application.rb
+++ b/apps/workbench/config/application.rb
@@ -19,7 +19,7 @@ require "rails/test_unit/railtie"
 
 Bundler.require(:default, Rails.env)
 
-if Rails.env == 'test'
+if ENV["ARVADOS_RAILS_LOG_TO_STDOUT"]
   Rails.logger = ActiveSupport::TaggedLogging.new(Logger.new(STDOUT))
 end
 

diff --git a/lib/boot/passenger.go b/lib/boot/passenger.go
index 7ebb36e474a537be8648669d681b8574174c322f..41805ba2b9f9054b1efb16880a2cfeca1d523ff6 100644 (file)
--- a/lib/boot/passenger.go
+++ b/lib/boot/passenger.go
@@ -107,7 +107,7 @@ func (runner runPassenger) Run(ctx context.Context, fail func(error), super *Sup
        super.waitShutdown.Add(1)
        go func() {
                defer super.waitShutdown.Done()
-               err = super.RunProgram(ctx, runner.src, nil, nil, "bundle", "exec",
+               err = super.RunProgram(ctx, runner.src, nil, []string{"ARVADOS_RAILS_LOG_TO_STDOUT=1"}, "bundle", "exec",
                        "passenger", "start",
                        "-p", port,
                        "--log-file", "/dev/stderr",

diff --git a/lib/boot/seed.go b/lib/boot/seed.go
index 650c83688605f230515a7abfda4a5cba0e9d8639..ce5d296bdd19a97042a8f43912e881c8172f460e 100644 (file)
--- a/lib/boot/seed.go
+++ b/lib/boot/seed.go
@@ -20,7 +20,7 @@ func (seedDatabase) Run(ctx context.Context, fail func(error), super *Supervisor
        if err != nil {
                return err
        }
-       err = super.RunProgram(ctx, "services/api", nil, nil, "bundle", "exec", "rake", "db:setup")
+       err = super.RunProgram(ctx, "services/api", nil, []string{"ARVADOS_RAILS_LOG_TO_STDOUT=1"}, "bundle", "exec", "rake", "db:setup")
        if err != nil {
                return err
        }

diff --git a/sdk/python/tests/run_test_server.py b/sdk/python/tests/run_test_server.py
index bca372ccdd32da49cccb2d146014dc7c67be39e7..41334292db983ef79c1e36b960bfdfc56faa8961 100644 (file)
--- a/sdk/python/tests/run_test_server.py
+++ b/sdk/python/tests/run_test_server.py
@@ -321,6 +321,7 @@ def run(leave_running_atexit=False):
     port = internal_port_from_config("RailsAPI")
     env = os.environ.copy()
     env['RAILS_ENV'] = 'test'
+    env['ARVADOS_RAILS_LOG_TO_STDOUT'] = '1'
     env.pop('ARVADOS_WEBSOCKETS', None)
     env.pop('ARVADOS_TEST_API_HOST', None)
     env.pop('ARVADOS_API_HOST', None)

diff --git a/services/api/config/application.rb b/services/api/config/application.rb
index 7901a7fd83897e2b6b5750cdb4f9e83337afb83f..b6174a0d8989f36e2e851431b18fe1627a33dbb8 100644 (file)
--- a/services/api/config/application.rb
+++ b/services/api/config/application.rb
@@ -40,7 +40,7 @@ if defined?(Bundler)
   end
 end
 
-if Rails.env == 'test'
+if ENV["ARVADOS_RAILS_LOG_TO_STDOUT"]
   Rails.logger = ActiveSupport::TaggedLogging.new(Logger.new(STDOUT))
 end