github/jumpserver
1
0
Fork 0
mirror of https://github.com/jumpserver/jumpserver.git synced 2025-09-21 11:28:38 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'ansible_api' into ops_dev

Browse Source 
# Conflicts:
#	apps/jumpserver/urls.py
#	apps/locale/zh/LC_MESSAGES/django.po
#	apps/templates/_nav.html
#	requirements.txt
#	run_server.py
This commit is contained in:
Administrator
2016-11-24 17:57:50 +08:00
parent c743715459 7c4aefd959
commit c289d6a4c5
42 changed files with 3943 additions and 679 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
run_server.py
View File

@@ -30,7 +30,7 @@ def start_celery():
os.chdir(apps_dir)
os.environ.setdefault('C_FORCE_ROOT', '1')
print('start celery')
subprocess.call('celery -A common worker -B -s /tmp/celerybeat-schedule -l info ', shell=True)
subprocess.call('celery -A common worker -P eventlet -B -s /tmp/celerybeat-schedule -l info ', shell=True)
def main():