Skip to content

P
physical
Commit d52d57d0 authored by 吴升宇's avatar 吴升宇
Browse files
Options

fix conflict

parent ecef1d60
Show whitespace changes
Inline Side-by-side
Showing with 1 addition and 8 deletions
Makefile
View file @ d52d57d0
crontab: crontab:
cp crontab.py /data/log/physical/app/crontab.py && python /data/log/physical/app/crontab.py && python /data/log/physical/app/crontabs.py cp crontab.py /data/log/physical/app/crontab.py && python /data/log/physical/app/crontab.py && python /data/log/physical/app/crontabs.py
<<<<<<< HEAD
=======
>>>>>>> fe8ae25876e5baba8581e3a79f5440c3f7f21dca
celery: celery:
celery -A physical worker -c 1 -Q tapir-alpha -l debug --max-tasks-per-child == 500 celery -A physical worker -c 1 -Q vest -l debug
README.md
View file @ d52d57d0
...@@ -56,10 +56,7 @@ celery -A physical beat ...@@ -56,10 +56,7 @@ celery -A physical beat
### physical策略端脚本 ### physical策略端脚本
在Alp-Test-Cos-test001服务器上，通过crontab -l查看 在Alp-Test-Cos-test001服务器上，通过crontab -l查看
<<<<<<< HEAD
更新脚本 更新脚本
```bash ```bash
make crontab make crontab
``` ```
=======
>>>>>>> fe8ae25876e5baba8581e3a79f5440c3f7f21dca
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment