From 3bd7a0919955919072e03490f8ea5f74c5265a3d Mon Sep 17 00:00:00 2001 From: Dylan William Hardison Date: Thu, 21 Jun 2018 22:06:55 -0400 Subject: Revert "test test, is this thing on?" This reverts commit 9eef87781b9a0e8de5c92e0c0aad2c63c6394c1b. --- .circleci/config.yml | 6 ++++++ conf/log4perl-test.conf | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index ed6ce4094..a70ea3ca6 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -37,6 +37,12 @@ defaults: BMO_memcached_servers: localhost:11211 BMO_memcached_namespace: "bugzilla:" BMO_urlbase: AUTOMATIC + HTTPD_StartServers: 1 + HTTPD_MinSpareServers: 1 + HTTPD_MaxSpareServers: 1 + HTTPD_ServerLimit: 1 + HTTPD_MaxClients: 1 + HTTPD_MaxRequestsPerChild: 4000 mysql_env: &mysql_env MYSQL_DATABASE: bugs diff --git a/conf/log4perl-test.conf b/conf/log4perl-test.conf index 7e185b20f..1760279db 100644 --- a/conf/log4perl-test.conf +++ b/conf/log4perl-test.conf @@ -6,7 +6,7 @@ log4perl.appender.Cereal.defer_connection=1 log4perl.appender.Cereal.layout = Log::Log4perl::Layout::PatternLayout log4perl.appender.Cereal.layout.ConversionPattern = %X{request_id} %d %6p | %c | %m{chomp}%n -log4perl.filter.LOG_TO_STDERR = sub { 0 } +log4perl.filter.LOG_TO_STDERR = sub { not $ENV{LOG4PERL_STDERR_DISABLE} } log4perl.appender.Screen = Log::Log4perl::Appender::Screen log4perl.appender.Screen.Filter = LOG_TO_STDERR log4perl.appender.Screen.stderr = 1 -- cgit v1.2.3-24-g4f1b