shaba/awx
1
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2024-11-01 16:51:11 +03:00
Code Releases Activity

Merge branch 'release_2.3.1' into stable

Browse Source 
* release_2.3.1:
  Add 2.3.1 to the reprepro distribution manifest
  Update version to 2.3.1 and update changelog
  Remove unused time import
  Fix proot controlpersist cleanup issue
This commit is contained in:
Matthew Jones 2015-10-02 16:33:31 -04:00
commit 4bcd19f833
2 changed files with 6 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
awx/__init__.py
View File

@ -6,7 +6,7 @@ import sys
import warnings import warnings
import site import site
__version__ = '2.3.0' __version__ = '2.3.1'
__all__ = ['__version__'] __all__ = ['__version__']

33
awx/plugins/callback/job_event_callback.py
View File

@ -37,7 +37,6 @@ import logging
import os import os
import pwd import pwd
import urlparse import urlparse
import time
# Requests # Requests
import requests import requests
@ -45,12 +44,7 @@ import requests
# ZeroMQ # ZeroMQ
import zmq import zmq
# PSUtil import psutil
try:
import psutil
except ImportError:
psutil = None
class TokenAuth(requests.auth.AuthBase): class TokenAuth(requests.auth.AuthBase):
@ -249,19 +243,14 @@ class BaseCallbackModule(object):
if not cp_files: if not cp_files:
return return
# HACK: If psutil isn't available, sleep and allow the control master
# processes to timeout and die.
if not psutil:
time.sleep(60)
# Attempt to find any running control master processes. # Attempt to find any running control master processes.
username = pwd.getpwuid(os.getuid())[0] username = pwd.getpwuid(os.getuid())[0]
ssh_cm_procs = [] ssh_cm_procs = []
for proc in psutil.process_iter(): for proc in psutil.process_iter():
try: try:
pname = proc.name pname = proc.name()
pcmdline = proc.cmdline pcmdline = proc.cmdline()
pusername = proc.username pusername = proc.username()
except psutil.NoSuchProcess: except psutil.NoSuchProcess:
continue continue
if pusername != username: if pusername != username:
@ -277,19 +266,7 @@ class BaseCallbackModule(object):
# version of psutil that may not have wait_procs implemented. # version of psutil that may not have wait_procs implemented.
for proc in ssh_cm_procs: for proc in ssh_cm_procs:
proc.terminate() proc.terminate()
if hasattr(psutil, 'wait_procs'): procs_gone, procs_alive = psutil.wait_procs(ssh_cm_procs, timeout=5)
procs_gone, procs_alive = psutil.wait_procs(ssh_cm_procs, timeout=5)
else:
procs_gone = []
procs_alive = ssh_cm_procs[:]
for x in xrange(5):
for proc in procs_alive[:]:
if not proc.is_running():
procs_alive.remove(proc)
procs_gone.append(proc)
if not procs_alive:
break
time.sleep(1)
for proc in procs_alive: for proc in procs_alive:
proc.kill() proc.kill()