2 files changed, 55 insertions, 11 deletions

diff --git a/api/resources/v1/env.py b/api/resources/v1/env.py
index 47ea91643..7c831fd74 100644
--- a/api/resources/v1/env.py
+++ b/api/resources/v1/env.py
@@ -101,21 +101,15 @@ class V1Env(ApiResource):
 
     def _create_data_source(self, ip):
         url = 'http://admin:admin@{}:{}/api/datasources'.format(ip, consts.GRAFANA_PORT)
-        influx_conf = utils.parse_ini_file(consts.CONF_FILE)
-
-        try:
-            influx_url = influx_conf['dispatcher_influxdb']['target']
-        except KeyError:
-            LOG.exception('influxdb url not set in yardstick.conf')
-            raise
+        influx_conf = utils.parse_ini_file(consts.CONF_FILE).get('dispatcher_influxdb', {})
 
         data = {
             "name": "yardstick",
             "type": "influxdb",
             "access": "proxy",
-            "url": influx_url,
-            "password": "root",
-            "user": "root",
+            "url": influx_conf.get('target', ''),
+            "password": influx_conf.get('password', ''),
+            "user": influx_conf.get('username', ''),
             "database": "yardstick",
             "basicAuth": True,
             "basicAuthUser": "admin",
@@ -123,7 +117,7 @@ class V1Env(ApiResource):
             "isDefault": True,
         }
         try:
-            HttpClient().post(url, data)
+            HttpClient().post(url, data, timeout=10)
         except Exception:
             LOG.exception('Create datasources failed')
             raise
diff --git a/api/resources/v1/tasks.py b/api/resources/v1/tasks.py
new file mode 100644
index 000000000..52455fbf5
--- /dev/null
+++ b/api/resources/v1/tasks.py
@@ -0,0 +1,50 @@
+##############################################################################
+# Copyright (c) 2016 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
+##############################################################################
+import os
+import errno
+import uuid
+
+from api import ApiResource
+from api.database.v1.handlers import TasksHandler
+from yardstick.common import constants as consts
+from yardstick.common.utils import result_handler
+
+
+class V1TaskLog(ApiResource):
+    def get(self, task_id):
+
+        try:
+            uuid.UUID(task_id)
+        except ValueError:
+            return result_handler(consts.API_ERROR, 'invalid task_id')
+
+        task_handler = TasksHandler()
+        try:
+            task = task_handler.get_task_by_taskid(task_id)
+        except ValueError:
+            return result_handler(consts.API_ERROR, 'invalid task_id')
+
+        index = int(self._get_args().get('index', 0))
+
+        try:
+            with open(os.path.join(consts.TASK_LOG_DIR, '{}.log'.format(task_id))) as f:
+                f.seek(index)
+                data = f.readlines()
+                index = f.tell()
+        except OSError as e:
+            if e.errno == errno.ENOENT:
+                return result_handler(consts.API_ERROR, 'log file does not exist')
+            return result_handler(consts.API_ERROR, 'error with log file')
+
+        return_data = {
+            'index': index,
+            'data': data
+        }
+
+        return result_handler(task.status, return_data)