diff --git a/README.md b/README.md index e050480..d16b2cc 100644 --- a/README.md +++ b/README.md @@ -67,7 +67,7 @@ ## 安装 ### Docker 一键快速构建 -- 进入主目录(先安装 docker 环境) +- 进入主目录(先安装 docker 环境, 注意要clone整个项目) ``` docker-compose up -d diff --git a/cmdb-api/api/app.py b/cmdb-api/api/app.py index c86c1ed..51d2216 100644 --- a/cmdb-api/api/app.py +++ b/cmdb-api/api/app.py @@ -76,15 +76,6 @@ class MyJSONEncoder(DefaultJSONProvider): return o -def create_acl_app(config_object="settings"): - app = Flask(__name__.split(".")[0]) - app.config.from_object(config_object) - - register_extensions(app) - - return app - - def create_app(config_object="settings"): """Create application factory, as explained here: http://flask.pocoo.org/docs/patterns/appfactories/. diff --git a/docker-compose.yml b/docker-compose.yml index 6362070..3a8fa6e 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -47,13 +47,15 @@ services: flask db-setup flask common-check-new-columns gunicorn --workers=3 autoapp:app -b 0.0.0.0:5000 -D + + celery -A celery_worker.celery worker -E -Q one_cmdb_async --autoscale=5,2 --logfile=one_cmdb_async.log -D + celery -A celery_worker.celery worker -E -Q acl_async --logfile=one_acl_async.log --concurrency=2 -D + + nohup flask cmdb-trigger > trigger.log 2>&1 & flask cmdb-init-cache flask cmdb-init-acl - nohup flask cmdb-trigger > trigger.log 2>&1 & - nohup flask cmdb-counter > counter.log 2>&1 & + flask cmdb-counter > counter.log 2>&1 - celery -A celery_worker.celery worker -E -Q one_cmdb_async --autoscale=5,2 --logfile=one_cmdb_async.log -D - celery -A celery_worker.celery worker -E -Q acl_async --logfile=one_acl_async.log --concurrency=2 depends_on: - cmdb-db - cmdb-cache