Skip to content

Commit e32272a

Browse files
geekerzpgeekerzp
committed
Update log in python client
1 parent a26cf60 commit e32272a

File tree

2 files changed

+120
-52
lines changed

2 files changed

+120
-52
lines changed

‎modules/swagger-codegen/src/main/resources/python/configuration.mustache‎

Lines changed: 60 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -77,11 +77,13 @@ class Configuration(object):
7777
self.logger["package_logger"] = logging.getLogger("{{packageName}}")
7878
self.logger["urllib3_logger"] = logging.getLogger("urllib3")
7979
# Log format
80-
self.logging_format = '%(asctime)s %(levelname)s %(message)s'
80+
self.logger_format = '%(asctime)s %(levelname)s %(message)s'
81+
# Log stream handler
82+
self.logger_stream_handler = None
83+
# Log file handler
84+
self.logger_file_handler = None
8185
# Debug file location
82-
self.logging_stream_handler = None
83-
self.logging_file_handler = None
84-
self.logging_file = None
86+
self.logger_file = None
8587
# Debug switch
8688
self.debug = False
8789

@@ -92,37 +94,58 @@ class Configuration(object):
9294
self.ssl_ca_cert = None
9395

9496
@property
95-
def logging_file(self):
96-
return self.__logging_file
97+
def logger_file(self):
98+
"""
99+
Gets the logger_file.
100+
"""
101+
return self.__logger_file
102+
103+
@logger_file.setter
104+
def logger_file(self, value):
105+
"""
106+
Sets the logger_file.
107+
108+
If the logger_file is None, then add stream handler and remove file handler.
109+
Otherwise, add file handler and remove stream handler.
97110

98-
@logging_file.setter
99-
def logging_file(self, value):
100-
self.__logging_file = value
101-
if self.__logging_file:
111+
:param value: The logger_file path.
112+
:type: str
113+
"""
114+
self.__logger_file = value
115+
if self.__logger_file:
102116
# If set logging file,
103117
# then add file handler and remove stream handler.
104-
self.logging_file_handler = logging.FileHandler(self.__logging_file)
105-
self.logging_file_handler.setFormatter(self.logging_formatter)
118+
self.logger_file_handler = logging.FileHandler(self.__logger_file)
119+
self.logger_file_handler.setFormatter(self.logger_formatter)
106120
for _, logger in iteritems(self.logger):
107-
logger.addHandler(self.logging_file_handler)
108-
if self.logging_stream_handler:
109-
logger.removeHandler(self.logging_stream_handler)
121+
logger.addHandler(self.logger_file_handler)
122+
if self.logger_stream_handler:
123+
logger.removeHandler(self.logger_stream_handler)
110124
else:
111125
# If not set logging file,
112126
# then add stream handler and remove file handler.
113-
self.logging_stream_handler = logging.StreamHandler()
114-
self.logging_stream_handler.setFormatter(self.logging_formatter)
127+
self.logger_stream_handler = logging.StreamHandler()
128+
self.logger_stream_handler.setFormatter(self.logger_formatter)
115129
for _, logger in iteritems(self.logger):
116-
logger.addHandler(self.logging_stream_handler)
117-
if self.logging_file_handler:
118-
logger.removeHandler(self.logging_file_handler)
130+
logger.addHandler(self.logger_stream_handler)
131+
if self.logger_file_handler:
132+
logger.removeHandler(self.logger_file_handler)
119133

120134
@property
121135
def debug(self):
136+
"""
137+
Gets the debug status.
138+
"""
122139
return self.__debug
123140

124141
@debug.setter
125142
def debug(self, value):
143+
"""
144+
Sets the debug status.
145+
146+
:param value: The debug status, True or False.
147+
:type: bool
148+
"""
126149
self.__debug = value
127150
if self.__debug:
128151
# if debug status is True, turn on debug logging
@@ -139,13 +162,24 @@ class Configuration(object):
139162
httplib.HTTPConnection.debuglevel = 0
140163

141164
@property
142-
def logging_format(self):
143-
return self.__logging_format
165+
def logger_format(self):
166+
"""
167+
Gets the logger_format.
168+
"""
169+
return self.__logger_format
144170

145-
@logging_format.setter
146-
def logging_format(self, value):
147-
self.__logging_format = value
148-
self.logging_formatter = logging.Formatter(self.__logging_format)
171+
@logger_format.setter
172+
def logger_format(self, value):
173+
"""
174+
Sets the logger_format.
175+
176+
The logger_formatter will be updated when sets logger_format.
177+
178+
:param value: The format string.
179+
:type: str
180+
"""
181+
self.__logger_format = value
182+
self.logger_formatter = logging.Formatter(self.__logger_format)
149183

150184
def get_api_key_with_prefix(self, identifier):
151185
"""

‎samples/client/petstore/python/swagger_client/configuration.py‎

Lines changed: 60 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -77,11 +77,13 @@ def __init__(self):
7777
self.logger["package_logger"] = logging.getLogger("swagger_client")
7878
self.logger["urllib3_logger"] = logging.getLogger("urllib3")
7979
# Log format
80-
self.logging_format = '%(asctime)s %(levelname)s %(message)s'
80+
self.logger_format = '%(asctime)s %(levelname)s %(message)s'
81+
# Log stream handler
82+
self.logger_stream_handler = None
83+
# Log file handler
84+
self.logger_file_handler = None
8185
# Debug file location
82-
self.logging_stream_handler = None
83-
self.logging_file_handler = None
84-
self.logging_file = None
86+
self.logger_file = None
8587
# Debug switch
8688
self.debug = False
8789

@@ -92,37 +94,58 @@ def __init__(self):
9294
self.ssl_ca_cert = None
9395

9496
@property
95-
def logging_file(self):
96-
return self.__logging_file
97+
def logger_file(self):
98+
"""
99+
Gets the logger_file.
100+
"""
101+
return self.__logger_file
102+
103+
@logger_file.setter
104+
def logger_file(self, value):
105+
"""
106+
Sets the logger_file.
107+
108+
If the logger_file is None, then add stream handler and remove file handler.
109+
Otherwise, add file handler and remove stream handler.
97110
98-
@logging_file.setter
99-
def logging_file(self, value):
100-
self.__logging_file = value
101-
if self.__logging_file:
111+
:param value: The logger_file path.
112+
:type: str
113+
"""
114+
self.__logger_file = value
115+
if self.__logger_file:
102116
# If set logging file,
103117
# then add file handler and remove stream handler.
104-
self.logging_file_handler = logging.FileHandler(self.__logging_file)
105-
self.logging_file_handler.setFormatter(self.logging_formatter)
118+
self.logger_file_handler = logging.FileHandler(self.__logger_file)
119+
self.logger_file_handler.setFormatter(self.logger_formatter)
106120
for _, logger in iteritems(self.logger):
107-
logger.addHandler(self.logging_file_handler)
108-
if self.logging_stream_handler:
109-
logger.removeHandler(self.logging_stream_handler)
121+
logger.addHandler(self.logger_file_handler)
122+
if self.logger_stream_handler:
123+
logger.removeHandler(self.logger_stream_handler)
110124
else:
111125
# If not set logging file,
112126
# then add stream handler and remove file handler.
113-
self.logging_stream_handler = logging.StreamHandler()
114-
self.logging_stream_handler.setFormatter(self.logging_formatter)
127+
self.logger_stream_handler = logging.StreamHandler()
128+
self.logger_stream_handler.setFormatter(self.logger_formatter)
115129
for _, logger in iteritems(self.logger):
116-
logger.addHandler(self.logging_stream_handler)
117-
if self.logging_file_handler:
118-
logger.removeHandler(self.logging_file_handler)
130+
logger.addHandler(self.logger_stream_handler)
131+
if self.logger_file_handler:
132+
logger.removeHandler(self.logger_file_handler)
119133

120134
@property
121135
def debug(self):
136+
"""
137+
Gets the debug status.
138+
"""
122139
return self.__debug
123140

124141
@debug.setter
125142
def debug(self, value):
143+
"""
144+
Sets the debug status.
145+
146+
:param value: The debug status, True or False.
147+
:type: bool
148+
"""
126149
self.__debug = value
127150
if self.__debug:
128151
# if debug status is True, turn on debug logging
@@ -139,13 +162,24 @@ def debug(self, value):
139162
httplib.HTTPConnection.debuglevel = 0
140163

141164
@property
142-
def logging_format(self):
143-
return self.__logging_format
165+
def logger_format(self):
166+
"""
167+
Gets the logger_format.
168+
"""
169+
return self.__logger_format
144170

145-
@logging_format.setter
146-
def logging_format(self, value):
147-
self.__logging_format = value
148-
self.logging_formatter = logging.Formatter(self.__logging_format)
171+
@logger_format.setter
172+
def logger_format(self, value):
173+
"""
174+
Sets the logger_format.
175+
176+
The logger_formatter will be updated when sets logger_format.
177+
178+
:param value: The format string.
179+
:type: str
180+
"""
181+
self.__logger_format = value
182+
self.logger_formatter = logging.Formatter(self.__logger_format)
149183

150184
def get_api_key_with_prefix(self, identifier):
151185
"""

0 commit comments

Comments
 (0)