Skip to content
This repository was archived by the owner on Mar 10, 2024. It is now read-only.

shut down gracefully on SIGTERM. #1

Merged
merged 2 commits into from
Mar 2, 2021
Merged

shut down gracefully on SIGTERM. #1

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
466ece7
shut down gracefully on SIGTERM.
shay-k Mar 1, 2021
e6c869a
loop.run_forever instead of loop.run_until_complete
shay-k Mar 2, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 16 additions & 1 deletion jupyter_matlab_proxy/app.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
import asyncio
import logging
import json
import signal
from . import settings
from .app_state import AppState
from .util.exceptions import LicensingError
Expand Down Expand Up @@ -398,4 +399,18 @@ def main():
runner, host=app["settings"]["host_interface"], port=app["settings"]["app_port"]
)
loop.run_until_complete(site.start())
loop.run_forever()

fu = loop.create_future()
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Another option is to keep the loop.run_forever(), add the signal handler before it, and then call loop.stop() from shutdown

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I must use a synchronous method for the signal handler and shutdown func must remain async so it would wait for app.shutdown() and app.cleanup().
so the lambda now calls loop.stop and then I call loop.run_until_complete(shutdown())

# on SIGTERM setting the future result allowing the loop to exit.
loop.add_signal_handler(signal.SIGTERM, lambda : fu.set_result(True))
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: remove space after lambda

loop.run_until_complete(fu)

async def shutdown():
logger.info("Shutting down MATLAB proxy-app")
await app.shutdown()
await app.cleanup()
# waiting here to allow matlab to finish exiting.
await asyncio.sleep(5)
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this required? looks like the app cleanup is waiting for the MATLAB process to exist

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think so. i tried several times and in few cases matlab did not completed the exit and I got locked out of the matworks account for about half an hour. I will verify again.

Copy link
Collaborator Author

@shay-k shay-k Mar 2, 2021 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

verified. without this delay matlab is not finishing properly and the user is locked out.


loop.run_until_complete(shutdown())