diff options
author | chenjiankun <chenjiankun1@huawei.com> | 2017-01-04 17:41:18 +0000 |
---|---|---|
committer | chenjiankun <chenjiankun1@huawei.com> | 2017-01-10 10:03:24 +0000 |
commit | 63e75aad3b01de4fc20468d5dd9cdb9b15c5e11e (patch) | |
tree | 9f3600cb443029e0fbcec03c349d1b452dc2f938 /api/database | |
parent | 57011bd0769f54a98b90d489df0f38751ca76c0e (diff) |
Add API to get the status of async task
JIRA: YARDSTICK-526
Currently there are many API run a task using sub thread.
But we don't know the status of this task.
So we need to offer a API to query the status of this task.
Change-Id: I8d2cc558750bf9270aed4a7abb8bf35d17894d83
Signed-off-by: chenjiankun <chenjiankun1@huawei.com>
Diffstat (limited to 'api/database')
-rw-r--r-- | api/database/__init__.py | 6 | ||||
-rw-r--r-- | api/database/handler.py | 30 | ||||
-rw-r--r-- | api/database/models.py | 11 |
3 files changed, 41 insertions, 6 deletions
diff --git a/api/database/__init__.py b/api/database/__init__.py index bc2708bc7..5b0bb05a2 100644 --- a/api/database/__init__.py +++ b/api/database/__init__.py @@ -21,9 +21,3 @@ db_session = scoped_session(sessionmaker(autocommit=False, bind=engine)) Base = declarative_base() Base.query = db_session.query_property() - - -def init_db(): - subclasses = [subclass.__name__ for subclass in Base.__subclasses__()] - logger.debug('Import models: %s', subclasses) - Base.metadata.create_all(bind=engine) diff --git a/api/database/handler.py b/api/database/handler.py new file mode 100644 index 000000000..f6a22578f --- /dev/null +++ b/api/database/handler.py @@ -0,0 +1,30 @@ +# ############################################################################ +# Copyright (c) 2017 Huawei Technologies Co.,Ltd and others. +# +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# http://www.apache.org/licenses/LICENSE-2.0 +# ############################################################################ +from api.database import db_session +from api.database.models import AsyncTasks + + +class AsyncTaskHandler(object): + def insert(self, kwargs): + task = AsyncTasks(**kwargs) + db_session.add(task) + db_session.commit() + return task + + def update_status(self, task, status): + task.status = status + db_session.commit() + + def update_error(self, task, error): + task.error = error + db_session.commit() + + def get_task_by_taskid(self, task_id): + task = AsyncTasks.query.filter_by(task_id=task_id).first() + return task diff --git a/api/database/models.py b/api/database/models.py index 25e323842..2fc141c1f 100644 --- a/api/database/models.py +++ b/api/database/models.py @@ -23,3 +23,14 @@ class Tasks(Base): def __repr__(self): return '<Task %r>' % Tasks.task_id + + +class AsyncTasks(Base): + __tablename__ = 'asynctasks' + id = Column(Integer, primary_key=True) + task_id = Column(String(30)) + status = Column(Integer) + error = Column(String(120)) + + def __repr__(self): + return '<Task %r>' % AsyncTasks.task_id |