From c9a348d476b2ce20560ec58e38b2f7d5f32da5ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?dongdonglin=28=E6=9E=97=E5=90=91=E4=B8=9C=29?= Date: Tue, 23 Oct 2018 16:57:29 +0800 Subject: [PATCH 1/3] fix(train): using threading instead of mutiprocess --- app/service/time_series_detector/detect_service.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/app/service/time_series_detector/detect_service.py b/app/service/time_series_detector/detect_service.py index 24fea24..be67b51 100644 --- a/app/service/time_series_detector/detect_service.py +++ b/app/service/time_series_detector/detect_service.py @@ -10,7 +10,7 @@ Unless required by applicable law or agreed to in writing, software distributed import time import os -from multiprocessing import Process +import threading from app.dao.time_series_detector import anomaly_op from app.dao.time_series_detector import sample_op from app.dao.time_series_detector import train_op @@ -99,8 +99,9 @@ class DetectService(object): return build_ret_data(LACK_SAMPLE, "") train_op_obj.insert_train_info(train_params) try: - process = Process(target=self.__generate_model, args=(samples_list, task_id, )) - process.start() + t = threading.Thread(target=self.__generate_model, args=(samples_list, task_id, )) + t.setDaemon(False) + t.start() except Exception: train_status = "failed" params = { From d8fc126c869dfc9b0cf5e6a29b4de889dcc0e7cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?dongdonglin=28=E6=9E=97=E5=90=91=E4=B8=9C=29?= Date: Tue, 23 Oct 2018 17:19:57 +0800 Subject: [PATCH 2/3] fix(test): del test cases --- tests/test_common.py | 25 ------------------------- 1 file changed, 25 deletions(-) delete mode 100644 tests/test_common.py diff --git a/tests/test_common.py b/tests/test_common.py deleted file mode 100644 index dfd9a3f..0000000 --- a/tests/test_common.py +++ /dev/null @@ -1,25 +0,0 @@ -#!/usr/bin/env python -# -*- coding: UTF-8 -*- -""" -Tencent is pleased to support the open source community by making Metis available. -Copyright (C) 2018 THL A29 Limited, a Tencent company. All rights reserved. -Licensed under the BSD 3-Clause License (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at -https://opensource.org/licenses/BSD-3-Clause -Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. -""" - -from tests.fixtures import DataTestCase -from app.config.common import * -from app.utils.utils import * - -class CommonTestCase(DataTestCase): - - def test_check_value(self): - str_param = self.generate_random_str(INPUT_LEN_ENG_MAX+1) - self.assertTrue(validate_value(str_param) != 0 ) - list_param = [] - for i in range(0,INPUT_LIST_LEN_MAX): - list_param.append(self.generate_random_str(INPUT_LEN_ENG_MAX)) - self.assertTrue(validate_value(list_param) == 0 ) - list_param.append(self.generate_random_str(INPUT_LEN_ENG_MAX)) - self.assertFalse(validate_value(list_param) == 0 ) From 7e011446e3037d5efe65a171746eb7c756cbf066 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?dongdonglin=28=E6=9E=97=E5=90=91=E4=B8=9C=29?= Date: Wed, 24 Oct 2018 10:54:54 +0800 Subject: [PATCH 3/3] docs(install.md): update description of django version close #12 --- docs/install.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/install.md b/docs/install.md index 0c0088d..b55c627 100644 --- a/docs/install.md +++ b/docs/install.md @@ -22,7 +22,7 @@ | python版本:| 2.7版本| | MySQL版本:| 5.6.26及以上版本| | Node.js版本:| 8.11.1及以上版本|s -| Django版本:| 1.11.13及以上版本| +| Django版本:| 1.x.x 版本| 运行服务器要求：1台普通安装linux系统的机器即可（推荐CentOS系统），服务器需要开放80和8080端口