External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-02-21 21:20:08 -03:30
Code Issues Packages Projects Releases Wiki Activity

Bug fixes for CentOS

Browse Source
This commit is contained in:
Matthew Jones
2014-03-20 11:22:19 -04:00
parent 18a5a6556e
commit f1ac2ff899
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
awx/main/management/commands/run_task_system.py
View File

@@ -272,7 +272,7 @@ def run_taskmanager(command_port):
try: try:
message = command_socket.recv_json(flags=zmq.NOBLOCK) message = command_socket.recv_json(flags=zmq.NOBLOCK)
command_socket.send("1") command_socket.send("1")
except zmq.error.ZMQError,e: except zmq.ZMQError,e:
message = None message = None
if message is not None or (datetime.datetime.now() - last_rebuild).seconds > 60: if message is not None or (datetime.datetime.now() - last_rebuild).seconds > 60:
if message is not None and 'pause' in message: if message is not None and 'pause' in message:

4
awx/main/utils.py
View File

@@ -305,7 +305,9 @@ def get_system_task_capacity():
from django.conf import settings from django.conf import settings
if hasattr(settings, 'SYSTEM_TASK_CAPACITY'): if hasattr(settings, 'SYSTEM_TASK_CAPACITY'):
return settings.SYSTEM_TASK_CAPACITY return settings.SYSTEM_TASK_CAPACITY
total_mem_value = subprocess.check_output(['free','-m']).split()[7] proc = subprocess.Popen(['free', '-m'], stdout=subprocess.PIPE)
out,err = proc.communicate()
total_mem_value = out.split()[7]
if int(total_mem_value) <= 2048: if int(total_mem_value) <= 2048:
return 50 return 50
return 50 + ((int(total_mem_value) / 1024) - 2) * 75 return 50 + ((int(total_mem_value) / 1024) - 2) * 75