Commit 78f8a89a authored by Yann Bordenave's avatar Yann Bordenave Committed by Antoine Millet
Browse files

Fix spawning jobs in close/delaccount

parent 3e979d59

cloudcontrol/server/clients/cli.py

+9 −5
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ from cloudcontrol.server.repository import RepositoryOperationError 
from cloudcontrol.server.handlers import listed, Reporter

from cloudcontrol.server.clients import Client, RegisteredCCHandler

from cloudcontrol.server.jobs import (ColdMigrationJob, HotMigrationJob,

                                      CloneJob)

                                      CloneJob, KillClientJob)

from cloudcontrol.common.tql.db.tag import StaticTag



MIGRATION_TYPES = {'cold': ColdMigrationJob,
@@ -390,8 +390,10 @@ class CliHandler(RegisteredCCHandler): 
                else:

                    errs.success(obj['id'], 'account deleted')



                self.server.jobs.create('kill', author=self.client.login,

                                         account=obj['a'], gracetime=1)

                self.server.jobs.spawn(KillClientJob, self.client.login,

                                       settings={'server': self.server,

                                                 'account': obj['a'],

                                                 'gracetime': 1})



        return errs.get_dict()
@@ -419,8 +421,10 @@ class CliHandler(RegisteredCCHandler): 
                dbobj = self.server.db.get(obj['id'])

                dbobj.register(StaticTag('close', 'yes'), override=True)



                self.server.jobs.create('kill', author=self.client.login,

                                         account=obj['a'], gracetime=1)

                self.server.jobs.spawn(KillClientJob, self.client.login,

                                       settings={'server': self.server,

                                                 'account': obj['a'],

                                                 'gracetime': 1})



        return errs.get_dict()