Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add switch to turn redundant log file off #1819

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions azurelinuxagent/agent.py
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 2 additions & 0 deletions azurelinuxagent/common/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
3 changes: 3 additions & 0 deletions config/alpine/waagent.conf
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 3 additions & 0 deletions config/arch/waagent.conf
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
3 changes: 3 additions & 0 deletions config/bigip/waagent.conf
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
3 changes: 3 additions & 0 deletions config/clearlinux/waagent.conf
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
3 changes: 3 additions & 0 deletions config/coreos/waagent.conf
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
3 changes: 3 additions & 0 deletions config/debian/waagent.conf
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
3 changes: 3 additions & 0 deletions config/freebsd/waagent.conf
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
3 changes: 3 additions & 0 deletions config/gaia/waagent.conf
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
3 changes: 3 additions & 0 deletions config/iosxe/waagent.conf
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
3 changes: 3 additions & 0 deletions config/nsbsd/waagent.conf
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
3 changes: 3 additions & 0 deletions config/openbsd/waagent.conf
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
3 changes: 3 additions & 0 deletions config/suse/waagent.conf
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
3 changes: 3 additions & 0 deletions config/ubuntu/waagent.conf
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
3 changes: 3 additions & 0 deletions config/waagent.conf
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down