Mikaela/Limnoria
1
0
Fork 0
mirror of https://github.com/Mikaela/Limnoria.git synced 2024-11-26 20:59:27 +01:00
Code Issues Projects Releases Wiki Activity

Web: increase subprocess memory limit and catch MemoryError appropriately.

Browse Source
This commit is contained in:
Valentin Lorentz 2015-11-29 18:34:54 +00:00
parent 13c411b741
commit eaf9e40dc2
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/Web/plugin.py
View File

@ -100,9 +100,9 @@ def fetch_sandbox(f):
def newf(self, irc, *args): def newf(self, irc, *args):
try: try:
replies = commands.process(process, self, irc, *args, replies = commands.process(process, self, irc, *args,
timeout=10, heap_size=1024*1024, timeout=10, heap_size=10*1024*1024,
pn=self.name(), cn=f.__name__) pn=self.name(), cn=f.__name__)
except commands.ProcessTimeoutError: except commands.ProcessTimeoutError, MemoryError:
raise utils.web.Error(_('Page is too big or the server took ' raise utils.web.Error(_('Page is too big or the server took '
'too much time to answer the request.')) 'too much time to answer the request.'))
else: else: