Show More
@@ -95,6 +95,13 b' configitem(' | |||||
95 | b'track', |
|
95 | b'track', | |
96 | default=lambda: [b'*'], |
|
96 | default=lambda: [b'*'], | |
97 | ) |
|
97 | ) | |
|
98 | # Debug config option that also display the blackbox output on stderr | |||
|
99 | # (in addition to writing it to disk) | |||
|
100 | configitem( | |||
|
101 | b'blackbox', | |||
|
102 | b'debug.to-stderr', | |||
|
103 | default=False, | |||
|
104 | ) | |||
98 | configitem( |
|
105 | configitem( | |
99 | b'blackbox', |
|
106 | b'blackbox', | |
100 | b'ignore', |
|
107 | b'ignore', | |
@@ -134,6 +141,7 b' class blackboxlogger:' | |||||
134 | def _log(self, ui, event, msg, opts): |
|
141 | def _log(self, ui, event, msg, opts): | |
135 | default = ui.configdate(b'devel', b'default-date') |
|
142 | default = ui.configdate(b'devel', b'default-date') | |
136 | dateformat = ui.config(b'blackbox', b'date-format') |
|
143 | dateformat = ui.config(b'blackbox', b'date-format') | |
|
144 | debug_to_stderr = ui.configbool(b'blackbox', b'debug.to-stderr') | |||
137 | if dateformat: |
|
145 | if dateformat: | |
138 | date = dateutil.datestr(default, dateformat) |
|
146 | date = dateutil.datestr(default, dateformat) | |
139 | else: |
|
147 | else: | |
@@ -165,7 +173,10 b' class blackboxlogger:' | |||||
165 | maxfiles=self._maxfiles, |
|
173 | maxfiles=self._maxfiles, | |
166 | maxsize=self._maxsize, |
|
174 | maxsize=self._maxsize, | |
167 | ) as fp: |
|
175 | ) as fp: | |
168 |
|
|
176 | msg = fmt % args | |
|
177 | fp.write(msg) | |||
|
178 | if debug_to_stderr: | |||
|
179 | ui.write_err(msg) | |||
169 | except (IOError, OSError) as err: |
|
180 | except (IOError, OSError) as err: | |
170 | # deactivate this to avoid failed logging again |
|
181 | # deactivate this to avoid failed logging again | |
171 | self._trackedevents.clear() |
|
182 | self._trackedevents.clear() |
General Comments 0
You need to be logged in to leave comments.
Login now