Skip to content

Modify Log Handlers #115

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.

Sign up for GitHub

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

Merged
shiyuechengineer merged 1 commit into from
Aug 21, 2020
Merged

Modify Log Handlers #115

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
38 changes: 22 additions & 16 deletions meraki/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,26 +69,32 @@ def __init__(self, api_key=None, base_url=DEFAULT_BASE_URL, single_request_timeo
# Configure logging
if not suppress_logging:
self._logger = logging.getLogger(__name__)
self._logger.setLevel(logging.DEBUG)

formatter = logging.Formatter(
fmt='%(name)12s: %(levelname)8s > %(message)s',
datefmt='%Y-%m-%d %H:%M:%S'
)

if log_path and log_path[-1] != '/':
log_path += '/'
self._log_file = f'{log_path}{log_file_prefix}_log__{datetime.now():%Y-%m-%d_%H-%M-%S}.log'
if output_log:
logging.basicConfig(
filename=self._log_file,
level=logging.DEBUG,
format='%(asctime)s %(name)12s: %(levelname)8s > %(message)s',
datefmt='%Y-%m-%d %H:%M:%S')

handler_console = logging.StreamHandler()
handler_log = logging.FileHandler(
filename=self._log_file
)

handler_console.setFormatter(formatter)
handler_log.setFormatter(formatter)

if output_log and not self._logger.hasHandlers():
self._logger.addHandler(handler_log)
if print_console:
console = logging.StreamHandler()
console.setLevel(logging.INFO)
formatter = logging.Formatter('%(name)12s: %(levelname)8s > %(message)s')
console.setFormatter(formatter)
logging.getLogger('').addHandler(console)
elif print_console:
logging.basicConfig(
level=logging.DEBUG,
format='%(asctime)s %(name)12s: %(levelname)8s > %(message)s',
datefmt='%Y-%m-%d %H:%M:%S')
handler_console.setLevel(logging.INFO)
self._logger.addHandler(handler_console)
elif print_console and not self._logger.hasHandlers():
self._logger.addHandler(handler_console)
else:
self._logger = None

Expand Down
38 changes: 22 additions & 16 deletions meraki/aio/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,26 +69,32 @@ def __init__(self, api_key=None, base_url=DEFAULT_BASE_URL, single_request_timeo
# Configure logging
if not suppress_logging:
self._logger = logging.getLogger(__name__)
self._logger.setLevel(logging.DEBUG)

formatter = logging.Formatter(
fmt='%(name)12s: %(levelname)8s > %(message)s',
datefmt='%Y-%m-%d %H:%M:%S'
)

if log_path and log_path[-1] != '/':
log_path += '/'
self._log_file = f'{log_path}{log_file_prefix}_log__{datetime.now():%Y-%m-%d_%H-%M-%S}.log'
if output_log:
logging.basicConfig(
filename=self._log_file,
level=logging.DEBUG,
format='%(asctime)s %(name)12s: %(levelname)8s > %(message)s',
datefmt='%Y-%m-%d %H:%M:%S')

handler_console = logging.StreamHandler()
handler_log = logging.FileHandler(
filename=self._log_file
)

handler_console.setFormatter(formatter)
handler_log.setFormatter(formatter)

if output_log and not self._logger.hasHandlers():
self._logger.addHandler(handler_log)
if print_console:
console = logging.StreamHandler()
console.setLevel(logging.INFO)
formatter = logging.Formatter('%(name)12s: %(levelname)8s > %(message)s')
console.setFormatter(formatter)
logging.getLogger('').addHandler(console)
elif print_console:
logging.basicConfig(
level=logging.DEBUG,
format='%(asctime)s %(name)12s: %(levelname)8s > %(message)s',
datefmt='%Y-%m-%d %H:%M:%S')
handler_console.setLevel(logging.INFO)
self._logger.addHandler(handler_console)
elif print_console and not self._logger.hasHandlers():
self._logger.addHandler(handler_console)
else:
self._logger = None

Expand Down
38 changes: 22 additions & 16 deletions meraki_v0/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,26 +138,32 @@ def __init__(self, api_key=None, base_url=DEFAULT_BASE_URL, single_request_timeo
# Configure logging
if not suppress_logging:
self._logger = logging.getLogger(__name__)
self._logger.setLevel(logging.DEBUG)

formatter = logging.Formatter(
fmt='%(name)12s: %(levelname)8s > %(message)s',
datefmt='%Y-%m-%d %H:%M:%S'
)

if log_path and log_path[-1] != '/':
log_path += '/'
self._log_file = f'{log_path}{log_file_prefix}_log__{datetime.now():%Y-%m-%d_%H-%M-%S}.log'
if output_log:
logging.basicConfig(
filename=self._log_file,
level=logging.DEBUG,
format='%(asctime)s %(name)12s: %(levelname)8s > %(message)s',
datefmt='%Y-%m-%d %H:%M:%S')

handler_console = logging.StreamHandler()
handler_log = logging.FileHandler(
filename=self._log_file
)

handler_console.setFormatter(formatter)
handler_log.setFormatter(formatter)

if output_log and not self._logger.hasHandlers():
self._logger.addHandler(handler_log)
if print_console:
console = logging.StreamHandler()
console.setLevel(logging.INFO)
formatter = logging.Formatter('%(name)12s: %(levelname)8s > %(message)s')
console.setFormatter(formatter)
logging.getLogger('').addHandler(console)
elif print_console:
logging.basicConfig(
level=logging.DEBUG,
format='%(asctime)s %(name)12s: %(levelname)8s > %(message)s',
datefmt='%Y-%m-%d %H:%M:%S')
handler_console.setLevel(logging.INFO)
self._logger.addHandler(handler_console)
elif print_console and not self._logger.hasHandlers():
self._logger.addHandler(handler_console)
else:
self._logger = None

Expand Down
38 changes: 22 additions & 16 deletions meraki_v0/aio/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,26 +135,32 @@ def __init__(self, api_key=None, base_url=DEFAULT_BASE_URL, single_request_timeo
# Configure logging
if not suppress_logging:
self._logger = logging.getLogger(__name__)
self._logger.setLevel(logging.DEBUG)

formatter = logging.Formatter(
fmt='%(name)12s: %(levelname)8s > %(message)s',
datefmt='%Y-%m-%d %H:%M:%S'
)

if log_path and log_path[-1] != '/':
log_path += '/'
self._log_file = f'{log_path}{log_file_prefix}_log__{datetime.now():%Y-%m-%d_%H-%M-%S}.log'
if output_log:
logging.basicConfig(
filename=self._log_file,
level=logging.DEBUG,
format='%(asctime)s %(name)12s: %(levelname)8s > %(message)s',
datefmt='%Y-%m-%d %H:%M:%S')

handler_console = logging.StreamHandler()
handler_log = logging.FileHandler(
filename=self._log_file
)

handler_console.setFormatter(formatter)
handler_log.setFormatter(formatter)

if output_log and not self._logger.hasHandlers():
self._logger.addHandler(handler_log)
if print_console:
console = logging.StreamHandler()
console.setLevel(logging.INFO)
formatter = logging.Formatter('%(name)12s: %(levelname)8s > %(message)s')
console.setFormatter(formatter)
logging.getLogger('').addHandler(console)
elif print_console:
logging.basicConfig(
level=logging.DEBUG,
format='%(asctime)s %(name)12s: %(levelname)8s > %(message)s',
datefmt='%Y-%m-%d %H:%M:%S')
handler_console.setLevel(logging.INFO)
self._logger.addHandler(handler_console)
elif print_console and not self._logger.hasHandlers():
self._logger.addHandler(handler_console)
else:
self._logger = None

Expand Down