Show More
@@ -15,7 +15,7 b'' | |||
|
15 | 15 | # along with this program; if not, write to the Free Software Foundation, |
|
16 | 16 | # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
|
17 | 17 | |
|
18 | ||
|
18 | import io | |
|
19 | 19 | import os |
|
20 | 20 | import time |
|
21 | 21 | import sys |
@@ -34,14 +34,13 b" exc_store_dir_name = 'rc_exception_store" | |||
|
34 | 34 | |
|
35 | 35 | |
|
36 | 36 | def exc_serialize(exc_id, tb, exc_type, extra_data=None): |
|
37 | ||
|
38 | 37 | data = { |
|
39 |
|
|
|
40 |
|
|
|
41 |
|
|
|
42 |
|
|
|
43 |
|
|
|
44 |
|
|
|
38 | "version": "v1", | |
|
39 | "exc_id": exc_id, | |
|
40 | "exc_utc_date": datetime.datetime.utcnow().isoformat(), | |
|
41 | "exc_timestamp": repr(time.time()), | |
|
42 | "exc_message": tb, | |
|
43 | "exc_type": exc_type, | |
|
45 | 44 | } |
|
46 | 45 | if extra_data: |
|
47 | 46 | data.update(extra_data) |
@@ -67,33 +66,38 b' def get_exc_store():' | |||
|
67 | 66 | |
|
68 | 67 | import vcsserver as app |
|
69 | 68 | |
|
70 | exc_store_dir = app.CONFIG.get('exception_tracker.store_path', '') or tempfile.gettempdir() | |
|
69 | exc_store_dir = ( | |
|
70 | app.CONFIG.get("exception_tracker.store_path", "") or tempfile.gettempdir() | |
|
71 | ) | |
|
71 | 72 | _exc_store_path = os.path.join(exc_store_dir, exc_store_dir_name) |
|
72 | 73 | |
|
73 | 74 | _exc_store_path = os.path.abspath(_exc_store_path) |
|
74 | 75 | if not os.path.isdir(_exc_store_path): |
|
75 | 76 | os.makedirs(_exc_store_path) |
|
76 |
log.debug( |
|
|
77 | log.debug("Initializing exceptions store at %s", _exc_store_path) | |
|
77 | 78 | _exc_store = _exc_store_path |
|
78 | 79 | |
|
79 | 80 | return _exc_store_path |
|
80 | 81 | |
|
81 | 82 | |
|
82 | 83 | def get_detailed_tb(exc_info): |
|
83 | from io import StringIO | |
|
84 | ||
|
85 | 84 | try: |
|
86 | from pip._vendor.rich import traceback as rich_tb, scope as rich_scope, console as rich_console | |
|
85 | from pip._vendor.rich import ( | |
|
86 | traceback as rich_tb, | |
|
87 | scope as rich_scope, | |
|
88 | console as rich_console, | |
|
89 | ) | |
|
87 | 90 | except ImportError: |
|
88 | 91 | try: |
|
89 | from rich import traceback as rich_tb, scope as rich_scope, console as rich_console | |
|
92 | from rich import ( | |
|
93 | traceback as rich_tb, | |
|
94 | scope as rich_scope, | |
|
95 | console as rich_console, | |
|
96 | ) | |
|
90 | 97 | except ImportError: |
|
91 | 98 | return None |
|
92 | 99 | |
|
93 | console = rich_console.Console( | |
|
94 | width=160, | |
|
95 | file=StringIO() | |
|
96 | ) | |
|
100 | console = rich_console.Console(width=160, file=io.StringIO()) | |
|
97 | 101 | |
|
98 | 102 | exc = rich_tb.Traceback.extract(*exc_info, show_locals=True) |
|
99 | 103 | |
@@ -104,11 +108,9 b' def get_detailed_tb(exc_info):' | |||
|
104 | 108 | theme=None, |
|
105 | 109 | word_wrap=False, |
|
106 | 110 | show_locals=False, |
|
107 | max_frames=100 | |
|
111 | max_frames=100, | |
|
108 | 112 | ) |
|
109 | 113 | |
|
110 | formatted_locals = "" | |
|
111 | ||
|
112 | 114 | # last_stack = exc.stacks[-1] |
|
113 | 115 | # last_frame = last_stack.frames[-1] |
|
114 | 116 | # if last_frame and last_frame.locals: |
@@ -127,14 +129,15 b' def get_request_metadata(request=None) -' | |||
|
127 | 129 | request_metadata = {} |
|
128 | 130 | if not request: |
|
129 | 131 | from pyramid.threadlocal import get_current_request |
|
132 | ||
|
130 | 133 | request = get_current_request() |
|
131 | 134 | |
|
132 | 135 | # NOTE(marcink): store request information into exc_data |
|
133 | 136 | if request: |
|
134 |
request_metadata[ |
|
|
135 |
request_metadata[ |
|
|
136 |
request_metadata[ |
|
|
137 |
request_metadata[ |
|
|
137 | request_metadata["client_address"] = getattr(request, "client_addr", "") | |
|
138 | request_metadata["user_agent"] = getattr(request, "user_agent", "") | |
|
139 | request_metadata["method"] = getattr(request, "method", "") | |
|
140 | request_metadata["url"] = getattr(request, "url", "") | |
|
138 | 141 | return request_metadata |
|
139 | 142 | |
|
140 | 143 | |
@@ -180,15 +183,16 b' def _store_exception(exc_id, exc_info, p' | |||
|
180 | 183 | exc_type_name = exc_type.__name__ |
|
181 | 184 | exc_data, org_data = exc_serialize(exc_id, tb, exc_type_name, extra_data=extra_data) |
|
182 | 185 | |
|
183 |
exc_pref_id = |
|
|
186 | exc_pref_id = f"{exc_id}_{prefix}_{org_data['exc_timestamp']}" | |
|
184 | 187 | exc_store_path = get_exc_store() |
|
185 | 188 | if not os.path.isdir(exc_store_path): |
|
186 | 189 | os.makedirs(exc_store_path) |
|
187 | 190 | stored_exc_path = os.path.join(exc_store_path, exc_pref_id) |
|
188 |
with open(stored_exc_path, |
|
|
191 | with open(stored_exc_path, "wb") as f: | |
|
189 | 192 | f.write(exc_data) |
|
190 |
log.debug( |
|
|
193 | log.debug("Stored generated exception %s as: %s", exc_id, stored_exc_path) | |
|
191 | 194 | |
|
195 | if request_path: | |
|
192 | 196 | log.error( |
|
193 | 197 | 'error occurred handling this request.\n' |
|
194 | 198 | 'Path: `%s`, %s', |
@@ -207,11 +211,12 b' def store_exception(exc_id, exc_info, pr' | |||
|
207 | 211 | exc_type = exc_info[0] |
|
208 | 212 | exc_type_name = exc_type.__name__ |
|
209 | 213 | |
|
210 | _store_exception(exc_id=exc_id, exc_info=exc_info, prefix=prefix, | |
|
211 | request_path=request_path) | |
|
214 | _store_exception( | |
|
215 | exc_id=exc_id, exc_info=exc_info, prefix=prefix, request_path=request_path, | |
|
216 | ) | |
|
212 | 217 | return exc_id, exc_type_name |
|
213 | 218 | except Exception: |
|
214 |
log.exception( |
|
|
219 | log.exception("Failed to store exception `%s` information", exc_id) | |
|
215 | 220 | # there's no way this can fail, it will crash server badly if it does. |
|
216 | 221 | pass |
|
217 | 222 | |
@@ -219,13 +224,13 b' def store_exception(exc_id, exc_info, pr' | |||
|
219 | 224 | def _find_exc_file(exc_id, prefix=global_prefix): |
|
220 | 225 | exc_store_path = get_exc_store() |
|
221 | 226 | if prefix: |
|
222 |
exc_id = f |
|
|
227 | exc_id = f"{exc_id}_{prefix}" | |
|
223 | 228 | else: |
|
224 | 229 | # search without a prefix |
|
225 |
exc_id = f |
|
|
230 | exc_id = f"{exc_id}" | |
|
226 | 231 | |
|
227 | 232 | found_exc_id = None |
|
228 |
matches = glob.glob(os.path.join(exc_store_path, exc_id) + |
|
|
233 | matches = glob.glob(os.path.join(exc_store_path, exc_id) + "*") | |
|
229 | 234 | if matches: |
|
230 | 235 | found_exc_id = matches[0] |
|
231 | 236 | |
@@ -235,10 +240,10 b' def _find_exc_file(exc_id, prefix=global' | |||
|
235 | 240 | def _read_exception(exc_id, prefix): |
|
236 | 241 | exc_id_file_path = _find_exc_file(exc_id=exc_id, prefix=prefix) |
|
237 | 242 | if exc_id_file_path: |
|
238 |
with open(exc_id_file_path, |
|
|
243 | with open(exc_id_file_path, "rb") as f: | |
|
239 | 244 | return exc_unserialize(f.read()) |
|
240 | 245 | else: |
|
241 |
log.debug( |
|
|
246 | log.debug("Exception File `%s` not found", exc_id_file_path) | |
|
242 | 247 | return None |
|
243 | 248 | |
|
244 | 249 | |
@@ -246,7 +251,7 b' def read_exception(exc_id, prefix=global' | |||
|
246 | 251 | try: |
|
247 | 252 | return _read_exception(exc_id=exc_id, prefix=prefix) |
|
248 | 253 | except Exception: |
|
249 |
log.exception( |
|
|
254 | log.exception("Failed to read exception `%s` information", exc_id) | |
|
250 | 255 | # there's no way this can fail, it will crash server badly if it does. |
|
251 | 256 | return None |
|
252 | 257 | |
@@ -258,7 +263,7 b' def delete_exception(exc_id, prefix=glob' | |||
|
258 | 263 | os.remove(exc_id_file_path) |
|
259 | 264 | |
|
260 | 265 | except Exception: |
|
261 |
log.exception( |
|
|
266 | log.exception("Failed to remove exception `%s` information", exc_id) | |
|
262 | 267 | # there's no way this can fail, it will crash server badly if it does. |
|
263 | 268 | pass |
|
264 | 269 |
General Comments 0
You need to be logged in to leave comments.
Login now