Bug 1442288 - Bugzilla::Logging should log when a program is being run interactively

3 files changed, 40 insertions, 23 deletions

diff --git a/conf/log4perl-json.conf b/conf/log4perl-json.conf
index 41562034e..c5d7e2c1f 100644
--- a/conf/log4perl-json.conf
+++ b/conf/log4perl-json.conf
@@ -1,16 +1,22 @@
-log4perl.rootLogger = INFO, Socket
-log4perl.appender.Socket = Log::Log4perl::Appender::Socket
-log4perl.appender.Socket.PeerAddr=127.0.0.1
-log4perl.appender.Socket.PeerPort=5880
-log4perl.appender.Socket.defer_connection=1
+log4perl.rootLogger = INFO, Cereal, Screen
+log4perl.appender.Cereal = Log::Log4perl::Appender::Socket
+log4perl.appender.Cereal.PeerAddr=127.0.0.1
+log4perl.appender.Cereal.PeerPort=5880
+log4perl.appender.Cereal.defer_connection=1
 
 # This class is currently bundled with bugzilla
-log4perl.appender.Socket.layout = Log::Log4perl::Layout::Mozilla
+log4perl.appender.Cereal.layout = Log::Log4perl::Layout::Mozilla
 
 # lines longer than this will not be logged in detail.
 # instead a scary message with a much higher severity will be logged.
-log4perl.appender.Socket.layout.max_json_length = 16384
+log4perl.appender.Cereal.layout.max_json_length = 16384
 # The default is Bugzilla. This is the "Logger" field
 # in https://wiki.mozilla.org/Firefox/Services/Logging#MozLog_JSON_schema
 #and it might be useful to pass in different values for different jobs.
-log4perl.appender.Socket.layout.name = Bugzilla
+log4perl.appender.Cereal.layout.name = Bugzilla
+
+log4perl.filter.IS_INTERACTIVE = sub { Bugzilla::Logging::is_interactive() }
+log4perl.appender.Screen = Log::Log4perl::Appender::Screen
+log4perl.appender.Screen.Filter = IS_INTERACTIVE
+log4perl.appender.Screen.layout = Log::Log4perl::Layout::PatternLayout
+log4perl.appender.Screen.layout.ConversionPattern = %-5.5p [%d] [%c] %m{chomp} at %F line %L (%M)%n
diff --git a/conf/log4perl-syslog.conf b/conf/log4perl-syslog.conf
index 32f3d4c11..c21c240d8 100644
--- a/conf/log4perl-syslog.conf
+++ b/conf/log4perl-syslog.conf
@@ -1,9 +1,14 @@
-log4perl.rootLogger = INFO, syslog
-log4perl.appender.syslog = Log::Dispatch::Syslog
-log4perl.appender.syslog.min_level = notice
-log4perl.appender.syslog.ident = apache
-log4perl.appender.syslog.facility = local4
-log4perl.appender.syslog.logopt = cons,pid
-log4perl.appender.syslog.layout = Log::Log4perl::Layout::PatternLayout
-log4perl.appender.syslog.layout.ConversionPattern = [%c] %m{chomp}%n
+log4perl.rootLogger = INFO, Syslog, Screen
+log4perl.appender.Syslog = Log::Dispatch::Syslog
+log4perl.appender.Syslog.min_level = notice
+log4perl.appender.Syslog.ident = apache
+log4perl.appender.Syslog.facility = local4
+log4perl.appender.Syslog.logopt = cons,pid
+log4perl.appender.Syslog.layout = Log::Log4perl::Layout::PatternLayout
+log4perl.appender.Syslog.layout.ConversionPattern = [%c] %m{chomp}%n
 
+log4perl.filter.IS_INTERACTIVE = sub { Bugzilla::Logging::is_interactive() }
+log4perl.appender.Screen = Log::Log4perl::Appender::Screen
+log4perl.appender.Screen.Filter = IS_INTERACTIVE
+log4perl.appender.Screen.layout = Log::Log4perl::Layout::PatternLayout
+log4perl.appender.Screen.layout.ConversionPattern = %-5.5p [%d] [%c] %m{chomp} at %F line %L (%M)%n
diff --git a/conf/log4perl-test.conf b/conf/log4perl-test.conf
index 7f2309c80..eda81d31b 100644
--- a/conf/log4perl-test.conf
+++ b/conf/log4perl-test.conf
@@ -1,7 +1,13 @@
-log4perl.rootLogger = DEBUG, DebugSocket
-log4perl.appender.DebugSocket = Log::Log4perl::Appender::Socket
-log4perl.appender.DebugSocket.PeerAddr=127.0.0.1
-log4perl.appender.DebugSocket.PeerPort=5880
-log4perl.appender.DebugSocket.defer_connection=1
-log4perl.appender.DebugSocket.layout = Log::Log4perl::Layout::PatternLayout
-log4perl.appender.DebugSocket.layout.ConversionPattern = [%d] [%c] <%p> %m{chomp} at %F line %L (%M)%n
+log4perl.rootLogger = DEBUG, Cereal, Screen
+log4perl.appender.Cereal = Log::Log4perl::Appender::Socket
+log4perl.appender.Cereal.PeerAddr=127.0.0.1
+log4perl.appender.Cereal.PeerPort=5880
+log4perl.appender.Cereal.defer_connection=1
+log4perl.appender.Cereal.layout = Log::Log4perl::Layout::PatternLayout
+log4perl.appender.Cereal.layout.ConversionPattern = %-5.5p [%d] [%c] %m{chomp} at %F line %L (%M)%n
+
+log4perl.filter.IS_INTERACTIVE = sub { Bugzilla::Logging::is_interactive() }
+log4perl.appender.Screen = Log::Log4perl::Appender::Screen
+log4perl.appender.Screen.Filter = IS_INTERACTIVE
+log4perl.appender.Screen.layout = Log::Log4perl::Layout::PatternLayout
+log4perl.appender.Screen.layout.ConversionPattern = %-5.5p [%d] [%c] %m{chomp} at %F line %L (%M)%n
\ No newline at end of file