pingu_98/cara
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'fix/revert-multiprocessing' into 'master'

Browse source 
Revert the multiprocessing change from #214.

See merge request cara/cara!219
This commit is contained in:
Philip James Elson 2021-07-13 10:24:27 +00:00
commit 6802fbd737
2 changed files with 5 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
cara/apps/calculator/__init__.py
View file

@ -111,10 +111,7 @@ class ConcentrationModel(BaseRequestHandler):
base_url = self.request.protocol + "://" + self.request.host
report_generator: ReportGenerator = self.settings['report_generator']
report_task = self.settings["worker_pool"].submit(
report_generator.build_report, base_url, form,
)
report: str = await asyncio.wrap_future(report_task)
report = report_generator.build_report(base_url, form)
if self.settings.get("debug", False):
dt = (datetime.datetime.now() - start)
print(f'Report response time {dt.seconds}.{dt.microseconds}s')
@ -126,10 +123,7 @@ class StaticModel(BaseRequestHandler):
form = model_generator.FormData.from_dict(model_generator.baseline_raw_form_data())
base_url = self.request.protocol + "://" + self.request.host
report_generator: ReportGenerator = self.settings['report_generator']
report_task = self.settings["worker_pool"].submit(
report_generator.build_report, base_url, form,
)
report: str = await asyncio.wrap_future(report_task)
report = report_generator.build_report(base_url, form)
self.finish(report)
@ -239,5 +233,4 @@ def make_app(
# COOKIE_SECRET being undefined will result in no login information being
# presented to the user.
cookie_secret=os.environ.get('COOKIE_SECRET', '<undefined>'),
worker_pool=concurrent.futures.ProcessPoolExecutor(),
)

4
cara/tests/apps/calculator/test_webapp.py
View file

@ -63,7 +63,9 @@ class TestBasicApp(tornado.testing.AsyncHTTPTestCase):
# but the end time is after the other request (because it takes longer
# to process a report than a simple page).
assert response.start_time < other_response.start_time
assert end_time(response) > end_time(other_response)
# Known fail after reverting in https://gitlab.cern.ch/cara/cara/-/merge_requests/219.
with pytest.raises(AssertionError):
assert end_time(response) > end_time(other_response)
self.assertEqual(response.code, 200)
assert 'CERN HSE' not in response.body.decode()