Skip to content

Commit 0a2edb5

Browse files
author
Ranen Ghosh
committed
Fix emrun sporadic exit hang on Windows ; remove option
1 parent 404edb9 commit 0a2edb5

File tree

1 file changed

+2
-5
lines changed

1 file changed

+2
-5
lines changed

emrun.py

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -704,8 +704,8 @@ def do_POST(self):
704704
if not emrun_options.serve_after_exit:
705705
page_exit_code = int(data[6:])
706706
logv('Web page has quit with a call to exit() with return code ' + str(page_exit_code) + '. Shutting down web server. Pass --serve-after-exit to keep serving even after the page terminates with exit().')
707-
if emrun_options.force_exit:
708-
self.server.socket.setblocking(False)
707+
# Set server socket to nonblocking on shutdown to avoid sporadic deadlocks
708+
self.server.socket.setblocking(False)
709709
self.server.shutdown()
710710
return
711711
else:
@@ -1565,9 +1565,6 @@ def parse_args(args):
15651565
parser.add_argument('--dump-out-directory', default='dump_out', type=str,
15661566
help='If specified, overrides the directory for dump files using emrun_file_dump method.')
15671567

1568-
parser.add_argument('--force-exit', action='store_true',
1569-
help='If true, sets server socket to nonblocking on shutdown to avoid sporadic deadlocks.')
1570-
15711568
parser.add_argument('serve', nargs='?', default='')
15721569

15731570
parser.add_argument('cmdlineparams', nargs='*')

0 commit comments

Comments
 (0)