Annikka/evennia
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add another errback handler for error in #1207.

Browse source
This commit is contained in:
Griatch 2017-02-28 08:08:33 +01:00
parent e556c5e5d3
commit c15d5a26c4
2 changed files with 13 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
evennia/server/webserver.py
View file

@ -23,6 +23,8 @@ from twisted.web.wsgi import WSGIResource
from django.conf import settings from django.conf import settings
from django.core.handlers.wsgi import WSGIHandler from django.core.handlers.wsgi import WSGIHandler
from evennia.utils import logger
_UPSTREAM_IPS = settings.UPSTREAM_IPS _UPSTREAM_IPS = settings.UPSTREAM_IPS
_DEBUG = settings.DEBUG _DEBUG = settings.DEBUG
@ -70,7 +72,7 @@ class EvenniaReverseProxyResource(ReverseProxyResource):
resource (EvenniaReverseProxyResource): A proxy resource. resource (EvenniaReverseProxyResource): A proxy resource.
""" """
request.notifyFinish().addErrback(lambda f: f.cancel()) request.notifyFinish().addErrback(lambda f: logger.log_trace("%s\nCaught errback in webserver.py:75." % f))
return EvenniaReverseProxyResource( return EvenniaReverseProxyResource(
self.host, self.port, self.path + '/' + urlquote(path, safe=""), self.host, self.port, self.path + '/' + urlquote(path, safe=""),
self.reactor) self.reactor)

10
evennia/utils/evtable.py
View file

@ -1241,6 +1241,9 @@ class EvTable(object):
# actual table. This allows us to add columns/rows # actual table. This allows us to add columns/rows
# and re-balance over and over without issue. # and re-balance over and over without issue.
self.worktable = deepcopy(self.table) self.worktable = deepcopy(self.table)
self._borders()
return
options = copy(self.options) options = copy(self.options)
# balance number of rows to make a rectangular table # balance number of rows to make a rectangular table
@ -1572,3 +1575,10 @@ def _test():
table.reformat_column(3, width=30, align='r') table.reformat_column(3, width=30, align='r')
print(unicode(table)) print(unicode(table))
return table return table
def _test2():
table = EvTable("|yHeading1|n", "|B|[GHeading2|n", "Heading3")
for i in range(100):
table.add_row("This is col 0, row %i" % i, "|gThis is col 1, row |w%i|n|g.|n" % i, "This is col 2, row %i" % i)
return table