loafle/openapi-generator
3
0
Fork 0
forked from loafle/openapi-generator-original
Code Pull Requests Activity

Update log in python client

Browse Source
This commit is contained in:
geekerzp 2015-09-24 10:54:24 +08:00
parent a26cf60a22
commit e32272aedb
2 changed files with 120 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

86
modules/swagger-codegen/src/main/resources/python/configuration.mustache
View File

@ -77,11 +77,13 @@ class Configuration(object):
self.logger["package_logger"] = logging.getLogger("{{packageName}}") self.logger["package_logger"] = logging.getLogger("{{packageName}}")
self.logger["urllib3_logger"] = logging.getLogger("urllib3") self.logger["urllib3_logger"] = logging.getLogger("urllib3")
# Log format # Log format
self.logging_format = '%(asctime)s %(levelname)s %(message)s' self.logger_format = '%(asctime)s %(levelname)s %(message)s'
# Log stream handler
self.logger_stream_handler = None
# Log file handler
self.logger_file_handler = None
# Debug file location # Debug file location
self.logging_stream_handler = None self.logger_file = None
self.logging_file_handler = None
self.logging_file = None
# Debug switch # Debug switch
self.debug = False self.debug = False
@ -92,37 +94,58 @@ class Configuration(object):
self.ssl_ca_cert = None self.ssl_ca_cert = None
@property @property
def logging_file(self): def logger_file(self):
return self.__logging_file """
Gets the logger_file.
"""
return self.__logger_file
@logging_file.setter @logger_file.setter
def logging_file(self, value): def logger_file(self, value):
self.__logging_file = value """
if self.__logging_file: Sets the logger_file.
If the logger_file is None, then add stream handler and remove file handler.
Otherwise, add file handler and remove stream handler.
:param value: The logger_file path.
:type: str
"""
self.__logger_file = value
if self.__logger_file:
# If set logging file, # If set logging file,
# then add file handler and remove stream handler. # then add file handler and remove stream handler.
self.logging_file_handler = logging.FileHandler(self.__logging_file) self.logger_file_handler = logging.FileHandler(self.__logger_file)
self.logging_file_handler.setFormatter(self.logging_formatter) self.logger_file_handler.setFormatter(self.logger_formatter)
for _, logger in iteritems(self.logger): for _, logger in iteritems(self.logger):
logger.addHandler(self.logging_file_handler) logger.addHandler(self.logger_file_handler)
if self.logging_stream_handler: if self.logger_stream_handler:
logger.removeHandler(self.logging_stream_handler) logger.removeHandler(self.logger_stream_handler)
else: else:
# If not set logging file, # If not set logging file,
# then add stream handler and remove file handler. # then add stream handler and remove file handler.
self.logging_stream_handler = logging.StreamHandler() self.logger_stream_handler = logging.StreamHandler()
self.logging_stream_handler.setFormatter(self.logging_formatter) self.logger_stream_handler.setFormatter(self.logger_formatter)
for _, logger in iteritems(self.logger): for _, logger in iteritems(self.logger):
logger.addHandler(self.logging_stream_handler) logger.addHandler(self.logger_stream_handler)
if self.logging_file_handler: if self.logger_file_handler:
logger.removeHandler(self.logging_file_handler) logger.removeHandler(self.logger_file_handler)
@property @property
def debug(self): def debug(self):
"""
Gets the debug status.
"""
return self.__debug return self.__debug
@debug.setter @debug.setter
def debug(self, value): def debug(self, value):
"""
Sets the debug status.
:param value: The debug status, True or False.
:type: bool
"""
self.__debug = value self.__debug = value
if self.__debug: if self.__debug:
# if debug status is True, turn on debug logging # if debug status is True, turn on debug logging
@ -139,13 +162,24 @@ class Configuration(object):
httplib.HTTPConnection.debuglevel = 0 httplib.HTTPConnection.debuglevel = 0
@property @property
def logging_format(self): def logger_format(self):
return self.__logging_format """
Gets the logger_format.
"""
return self.__logger_format
@logging_format.setter @logger_format.setter
def logging_format(self, value): def logger_format(self, value):
self.__logging_format = value """
self.logging_formatter = logging.Formatter(self.__logging_format) Sets the logger_format.
The logger_formatter will be updated when sets logger_format.
:param value: The format string.
:type: str
"""
self.__logger_format = value
self.logger_formatter = logging.Formatter(self.__logger_format)
def get_api_key_with_prefix(self, identifier): def get_api_key_with_prefix(self, identifier):
""" """

86
samples/client/petstore/python/swagger_client/configuration.py
View File

@ -77,11 +77,13 @@ class Configuration(object):
self.logger["package_logger"] = logging.getLogger("swagger_client") self.logger["package_logger"] = logging.getLogger("swagger_client")
self.logger["urllib3_logger"] = logging.getLogger("urllib3") self.logger["urllib3_logger"] = logging.getLogger("urllib3")
# Log format # Log format
self.logging_format = '%(asctime)s %(levelname)s %(message)s' self.logger_format = '%(asctime)s %(levelname)s %(message)s'
# Log stream handler
self.logger_stream_handler = None
# Log file handler
self.logger_file_handler = None
# Debug file location # Debug file location
self.logging_stream_handler = None self.logger_file = None
self.logging_file_handler = None
self.logging_file = None
# Debug switch # Debug switch
self.debug = False self.debug = False
@ -92,37 +94,58 @@ class Configuration(object):
self.ssl_ca_cert = None self.ssl_ca_cert = None
@property @property
def logging_file(self): def logger_file(self):
return self.__logging_file """
Gets the logger_file.
"""
return self.__logger_file
@logging_file.setter @logger_file.setter
def logging_file(self, value): def logger_file(self, value):
self.__logging_file = value """
if self.__logging_file: Sets the logger_file.
If the logger_file is None, then add stream handler and remove file handler.
Otherwise, add file handler and remove stream handler.
:param value: The logger_file path.
:type: str
"""
self.__logger_file = value
if self.__logger_file:
# If set logging file, # If set logging file,
# then add file handler and remove stream handler. # then add file handler and remove stream handler.
self.logging_file_handler = logging.FileHandler(self.__logging_file) self.logger_file_handler = logging.FileHandler(self.__logger_file)
self.logging_file_handler.setFormatter(self.logging_formatter) self.logger_file_handler.setFormatter(self.logger_formatter)
for _, logger in iteritems(self.logger): for _, logger in iteritems(self.logger):
logger.addHandler(self.logging_file_handler) logger.addHandler(self.logger_file_handler)
if self.logging_stream_handler: if self.logger_stream_handler:
logger.removeHandler(self.logging_stream_handler) logger.removeHandler(self.logger_stream_handler)
else: else:
# If not set logging file, # If not set logging file,
# then add stream handler and remove file handler. # then add stream handler and remove file handler.
self.logging_stream_handler = logging.StreamHandler() self.logger_stream_handler = logging.StreamHandler()
self.logging_stream_handler.setFormatter(self.logging_formatter) self.logger_stream_handler.setFormatter(self.logger_formatter)
for _, logger in iteritems(self.logger): for _, logger in iteritems(self.logger):
logger.addHandler(self.logging_stream_handler) logger.addHandler(self.logger_stream_handler)
if self.logging_file_handler: if self.logger_file_handler:
logger.removeHandler(self.logging_file_handler) logger.removeHandler(self.logger_file_handler)
@property @property
def debug(self): def debug(self):
"""
Gets the debug status.
"""
return self.__debug return self.__debug
@debug.setter @debug.setter
def debug(self, value): def debug(self, value):
"""
Sets the debug status.
:param value: The debug status, True or False.
:type: bool
"""
self.__debug = value self.__debug = value
if self.__debug: if self.__debug:
# if debug status is True, turn on debug logging # if debug status is True, turn on debug logging
@ -139,13 +162,24 @@ class Configuration(object):
httplib.HTTPConnection.debuglevel = 0 httplib.HTTPConnection.debuglevel = 0
@property @property
def logging_format(self): def logger_format(self):
return self.__logging_format """
Gets the logger_format.
"""
return self.__logger_format
@logging_format.setter @logger_format.setter
def logging_format(self, value): def logger_format(self, value):
self.__logging_format = value """
self.logging_formatter = logging.Formatter(self.__logging_format) Sets the logger_format.
The logger_formatter will be updated when sets logger_format.
:param value: The format string.
:type: str
"""
self.__logger_format = value
self.logger_formatter = logging.Formatter(self.__logger_format)
def get_api_key_with_prefix(self, identifier): def get_api_key_with_prefix(self, identifier):
""" """