rnhmjoj/qutebrowser
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Show error when YAML load took too long

Browse Source 
See #2777
This commit is contained in:
Florian Bruhin 2017-10-10 22:53:58 +02:00
parent 9c080538ba
commit 35335d954b
1 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
qutebrowser/utils/utils.py
View File

@ -27,6 +27,8 @@ import enum
import json import json
import os.path import os.path
import collections import collections
import datetime
import traceback
import functools import functools
import contextlib import contextlib
import socket import socket
@ -40,8 +42,10 @@ import pkg_resources
import yaml import yaml
try: try:
from yaml import CSafeLoader as YamlLoader, CSafeDumper as YamlDumper from yaml import CSafeLoader as YamlLoader, CSafeDumper as YamlDumper
YAML_C_EXT = True
except ImportError: # pragma: no cover except ImportError: # pragma: no cover
from yaml import SafeLoader as YamlLoader, SafeDumper as YamlDumper from yaml import SafeLoader as YamlLoader, SafeDumper as YamlDumper
YAML_C_EXT = False
import qutebrowser import qutebrowser
from qutebrowser.utils import qtutils, log, debug from qutebrowser.utils import qtutils, log, debug
@ -873,7 +877,22 @@ def expand_windows_drive(path):
def yaml_load(f): def yaml_load(f):
"""Wrapper over yaml.load using the C loader if possible.""" """Wrapper over yaml.load using the C loader if possible."""
return yaml.load(f, Loader=YamlLoader) start = datetime.datetime.now()
data = yaml.load(f, Loader=YamlLoader)
end = datetime.datetime.now()
delta = (end - start).total_seconds()
deadline = 3 if 'CI' in os.environ else 0.5
if delta > deadline:
log.misc.error(
"YAML load took {}s\n"
"version: {}\n"
"C extension: {}\n\n"
"{}".format(
delta, yaml.__version__, YAML_C_EXT,
'\n'.join(traceback.format_stack())))
return data
def yaml_dump(data, f=None): def yaml_dump(data, f=None):