[Notes] [Git][BuildStream/buildstream][master] 2 commits: _scheduler/scheduler.py: Ignore interrupt events while terminating.

[Tristan Van Berkom <gitlab mg gitlab com>]

Title: GitLab

Tristan Van Berkom pushed to branch master at BuildStream / buildstream

Commits:

• a0814399
  by Tristan Van Berkom at 2018-10-03T13:05:52Z

  _scheduler/scheduler.py: Ignore interrupt events while terminating.
  
  For some reason, we now receive a SIGINT from the main loop even
  when the SIGINT occurred with the handler disconnected in an interactive
  prompt. This patch simply ignores any received SIGINT events from the
  main loop in the case that we are already in the process of terminating.
  
  This fixes issue #693
  

• 0a1f8e3c
  by Tristan Van Berkom at 2018-10-03T13:42:20Z

  Merge branch 'tristan/fix-double-terminate-prompt' into 'master'
  
  _scheduler/scheduler.py: Ignore interrupt events while terminating.
  
  Closes #693
  
  See merge request BuildStream/buildstream!852

1 changed file:

• buildstream/_scheduler/scheduler.py

Changes:

buildstream/_scheduler/scheduler.py

---

...	...	@@ -387,6 +387,15 @@ class Scheduler():
387	387	# A loop registered event callback for keyboard interrupts
388	388	#
389	389	def _interrupt_event(self):
	390	+
	391	+ # FIXME: This should not be needed, but for some reason we receive an
	392	+ # additional SIGINT event when the user hits ^C a second time
	393	+ # to inform us that they really intend to terminate; even though
	394	+ # we have disconnected our handlers at this time.
	395	+ #
	396	+ if self.terminated:
	397	+ return
	398	+
390	399	# Leave this to the frontend to decide, if no
391	400	# interrrupt callback was specified, then just terminate.
392	401	if self._interrupt_callback:

—
View it on GitLab.
You're receiving this email because of your account on gitlab.com. If you'd like to receive fewer emails, you can adjust your notification settings.