Commit ef9fe79e by Őry Máté

Merge branch 'feature-vm-tasks' into 'master'

Feature vm tasks

See merge request !4
parents 64a1d1b9 e6bba405
...@@ -206,9 +206,9 @@ class shutdown(AbortableTask): ...@@ -206,9 +206,9 @@ class shutdown(AbortableTask):
time_limit = 120 time_limit = 120
@req_connection @req_connection
def run(self, **kwargs): def run(self, args):
from time import sleep from time import sleep
name = kwargs['name'] name, = args
try: try:
domain = lookupByName(name) domain = lookupByName(name)
domain.shutdown() domain.shutdown()
...@@ -221,7 +221,7 @@ class shutdown(AbortableTask): ...@@ -221,7 +221,7 @@ class shutdown(AbortableTask):
else: else:
raise raise
else: else:
if self.is_aborted(**kwargs): if self.is_aborted():
logging.info("Shutdown aborted on vm: %s", name) logging.info("Shutdown aborted on vm: %s", name)
return return
sleep(5) sleep(5)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment