Skip to content

Commit

Permalink
Merge pull request #11 from ros2/send-signal
Browse files Browse the repository at this point in the history
Added send_signal to ProcessDescriptor
  • Loading branch information
esteve committed Nov 11, 2015
2 parents 46e432d + 64cb246 commit ca730ff
Showing 1 changed file with 12 additions and 4 deletions.
16 changes: 12 additions & 4 deletions launch/launch/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,10 @@ def add_coroutine(self, coroutine, name=None, exit_handler=None):
raise RuntimeError("Task name '%s' already used" % name)
if exit_handler is None:
exit_handler = default_exit_handler
self.task_descriptors.append(CoroutineDescriptor(
coroutine, name, exit_handler))
coroutine_descriptor = CoroutineDescriptor(
coroutine, name, exit_handler)
self.task_descriptors.append(coroutine_descriptor)
return coroutine_descriptor

def add_process(self, cmd, name=None, env=None, output_handlers=None, exit_handler=None):
if name is not None and name in [p.name for p in self.task_descriptors]:
Expand All @@ -38,8 +40,10 @@ def add_process(self, cmd, name=None, env=None, output_handlers=None, exit_handl
output_handlers = CompositeOutputHandler(output_handlers)
if exit_handler is None:
exit_handler = default_exit_handler
self.task_descriptors.append(ProcessDescriptor(
cmd, name, output_handlers, exit_handler, env=env))
process_descriptor = ProcessDescriptor(
cmd, name, output_handlers, exit_handler, env=env)
self.task_descriptors.append(process_descriptor)
return process_descriptor


class TaskDescriptor(object):
Expand Down Expand Up @@ -68,3 +72,7 @@ def __init__(self, cmd, name, output_handler, exit_handler, env=None):
self.env = env
self.transport = None
self.protocol = None

def send_signal(self, signal):
if self.transport:
self.transport.send_signal(signal)

0 comments on commit ca730ff

Please sign in to comment.