From aa9a8f9170c2537fc987fa9489b7c134f98d51d5 Mon Sep 17 00:00:00 2001 From: Pascal de Bruijn Date: Wed, 18 Mar 2020 09:27:52 +0100 Subject: [PATCH] Add switch to turn redundant log file off --- azurelinuxagent/agent.py | 9 ++++++--- azurelinuxagent/common/conf.py | 2 ++ config/alpine/waagent.conf | 3 +++ config/arch/waagent.conf | 3 +++ config/bigip/waagent.conf | 3 +++ config/clearlinux/waagent.conf | 3 +++ config/coreos/waagent.conf | 3 +++ config/debian/waagent.conf | 3 +++ config/freebsd/waagent.conf | 3 +++ config/gaia/waagent.conf | 3 +++ config/iosxe/waagent.conf | 3 +++ config/nsbsd/waagent.conf | 3 +++ config/openbsd/waagent.conf | 3 +++ config/suse/waagent.conf | 3 +++ config/ubuntu/waagent.conf | 3 +++ config/waagent.conf | 3 +++ 16 files changed, 50 insertions(+), 3 deletions(-) diff --git a/azurelinuxagent/agent.py b/azurelinuxagent/agent.py index 5d373b9be..09e1ffc9d 100644 --- a/azurelinuxagent/agent.py +++ b/azurelinuxagent/agent.py @@ -62,11 +62,14 @@ def __init__(self, verbose, conf_file_path=None): #Init log verbose = verbose or conf.get_logs_verbose() level = logger.LogLevel.VERBOSE if verbose else logger.LogLevel.INFO - logger.add_logger_appender(logger.AppenderType.FILE, level, - path="/var/log/waagent.log") + + if conf.get_logs_file(): + logger.add_logger_appender(logger.AppenderType.FILE, level, + path="/var/log/waagent.log") + if conf.get_logs_console(): logger.add_logger_appender(logger.AppenderType.CONSOLE, level, - path="/dev/console") + path="/dev/console") if event.send_logs_to_telemetry(): logger.add_logger_appender(logger.AppenderType.TELEMETRY, diff --git a/azurelinuxagent/common/conf.py b/azurelinuxagent/common/conf.py index bfc61f025..04d2b5706 100644 --- a/azurelinuxagent/common/conf.py +++ b/azurelinuxagent/common/conf.py @@ -185,6 +185,8 @@ def get_logs_verbose(conf=__conf__): def get_logs_console(conf=__conf__): return conf.get_switch("Logs.Console", True) +def get_logs_file(conf=__conf__): + return conf.get_switch("Logs.File", True) def get_lib_dir(conf=__conf__): return conf.get("Lib.Dir", "/var/lib/waagent") diff --git a/config/alpine/waagent.conf b/config/alpine/waagent.conf index ac9466e11..a09ddc59b 100644 --- a/config/alpine/waagent.conf +++ b/config/alpine/waagent.conf @@ -53,6 +53,9 @@ ResourceDisk.MountOptions=None # Respond to load balancer probes if requested by Windows Azure. LBProbeResponder=y +# Enable File logging, default is y +# Logs.File=y + # Enable logging to serial console (y|n) # When stdout is not enough... # 'y' if not set diff --git a/config/arch/waagent.conf b/config/arch/waagent.conf index 8d509cf6b..0c4316f92 100644 --- a/config/arch/waagent.conf +++ b/config/arch/waagent.conf @@ -61,6 +61,9 @@ LBProbeResponder=y # Enable verbose logging (y|n) Logs.Verbose=n +# Enable File logging, default is y +# Logs.File=y + # Enable Console logging, default is y # Logs.Console=y diff --git a/config/bigip/waagent.conf b/config/bigip/waagent.conf index 7446bcb9c..d3a82a3f8 100644 --- a/config/bigip/waagent.conf +++ b/config/bigip/waagent.conf @@ -59,6 +59,9 @@ LBProbeResponder=y # Enable verbose logging (y|n) Logs.Verbose=n +# Enable File logging, default is y +# Logs.File=y + # Enable Console logging, default is y # Logs.Console=y diff --git a/config/clearlinux/waagent.conf b/config/clearlinux/waagent.conf index 10567cc9d..37ed0056e 100644 --- a/config/clearlinux/waagent.conf +++ b/config/clearlinux/waagent.conf @@ -60,6 +60,9 @@ ResourceDisk.SwapSizeMB=0 # Enable verbose logging (y|n) Logs.Verbose=n +# Enable File logging, default is y +# Logs.File=y + # Enable Console logging, default is y # Logs.Console=y diff --git a/config/coreos/waagent.conf b/config/coreos/waagent.conf index 8d3312c2e..e875eae15 100644 --- a/config/coreos/waagent.conf +++ b/config/coreos/waagent.conf @@ -65,6 +65,9 @@ LBProbeResponder=y # Enable verbose logging (y|n) Logs.Verbose=n +# Enable File logging, default is y +# Logs.File=y + # Enable Console logging, default is y # Logs.Console=y diff --git a/config/debian/waagent.conf b/config/debian/waagent.conf index 28e496ebd..4370bfadd 100644 --- a/config/debian/waagent.conf +++ b/config/debian/waagent.conf @@ -62,6 +62,9 @@ ResourceDisk.MountOptions=None # Enable verbose logging (y|n) Logs.Verbose=n +# Enable File logging, default is y +# Logs.File=y + # Enable Console logging, default is y # Logs.Console=y diff --git a/config/freebsd/waagent.conf b/config/freebsd/waagent.conf index 9c72ea27f..af447cf2a 100644 --- a/config/freebsd/waagent.conf +++ b/config/freebsd/waagent.conf @@ -59,6 +59,9 @@ ResourceDisk.MountOptions=None # Enable verbose logging (y|n) Logs.Verbose=n +# Enable File logging, default is y +# Logs.File=y + # Enable Console logging, default is y # Logs.Console=y diff --git a/config/gaia/waagent.conf b/config/gaia/waagent.conf index 6992ff294..2c1ff99c9 100644 --- a/config/gaia/waagent.conf +++ b/config/gaia/waagent.conf @@ -62,6 +62,9 @@ ResourceDisk.MountOptions=None # Enable verbose logging (y|n) Logs.Verbose=n +# Enable File logging, default is y +# Logs.File=y + # Enable Console logging, default is y # Logs.Console=y diff --git a/config/iosxe/waagent.conf b/config/iosxe/waagent.conf index 6787d30e9..75cc4e941 100644 --- a/config/iosxe/waagent.conf +++ b/config/iosxe/waagent.conf @@ -58,6 +58,9 @@ ResourceDisk.MountOptions=None # Enable verbose logging (y|n) Logs.Verbose=n +# Enable File logging, default is y +# Logs.File=y + # Enable Console logging, default is y # Logs.Console=y diff --git a/config/nsbsd/waagent.conf b/config/nsbsd/waagent.conf index 178f9a22e..90839f977 100644 --- a/config/nsbsd/waagent.conf +++ b/config/nsbsd/waagent.conf @@ -55,6 +55,9 @@ ResourceDisk.MountOptions=None # Enable verbose logging (y|n) TODO set n Logs.Verbose=n +# Enable File logging, default is y +# Logs.File=y + # Enable Console logging, default is y # Logs.Console=y diff --git a/config/openbsd/waagent.conf b/config/openbsd/waagent.conf index 54f2e118b..621d9ce2c 100644 --- a/config/openbsd/waagent.conf +++ b/config/openbsd/waagent.conf @@ -55,6 +55,9 @@ ResourceDisk.MountOptions=None # Enable verbose logging (y|n) Logs.Verbose=n +# Enable File logging, default is y +# Logs.File=y + # Enable Console logging, default is y # Logs.Console=y diff --git a/config/suse/waagent.conf b/config/suse/waagent.conf index 5e601e651..135bd1789 100644 --- a/config/suse/waagent.conf +++ b/config/suse/waagent.conf @@ -65,6 +65,9 @@ LBProbeResponder=y # Enable verbose logging (y|n) Logs.Verbose=n +# Enable File logging, default is y +# Logs.File=y + # Enable Console logging, default is y # Logs.Console=y diff --git a/config/ubuntu/waagent.conf b/config/ubuntu/waagent.conf index 759db7071..2e4ae168b 100644 --- a/config/ubuntu/waagent.conf +++ b/config/ubuntu/waagent.conf @@ -65,6 +65,9 @@ LBProbeResponder=y # Enable verbose logging (y|n) Logs.Verbose=n +# Enable File logging, default is y +# Logs.File=y + # Enable Console logging, default is y # Logs.Console=y diff --git a/config/waagent.conf b/config/waagent.conf index 62a9441fd..ce1215a3b 100644 --- a/config/waagent.conf +++ b/config/waagent.conf @@ -62,6 +62,9 @@ ResourceDisk.MountOptions=None # Enable verbose logging (y|n) Logs.Verbose=n +# Enable File logging, default is y +# Logs.File=y + # Enable Console logging, default is y # Logs.Console=y