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

Merge branch 'master' into expunge-zeromq-unstable

Browse Source 
Conflicts:
	awx/main/management/commands/run_callback_receiver.py
	awx/main/management/commands/run_task_system.py
This commit is contained in:
Luke Sneeringer
2014-11-11 12:00:25 -06:00
parent 122bf9fcd3 29eaa495bc
commit 3a8c32444b
4 changed files with 42 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
awx/main/management/commands/run_socketio_service.py
View File

@@ -32,6 +32,9 @@ from socketio import socketio_manage
from socketio.server import SocketIOServer
from socketio.namespace import BaseNamespace
def print_log(message):
print("[%s] %s" % (now().isoformat(), message))
class TowerBaseNamespace(BaseNamespace):
def get_allowed_methods(self):
@@ -67,7 +70,7 @@ class TowerBaseNamespace(BaseNamespace):
class TestNamespace(TowerBaseNamespace):
def recv_connect(self):
print("Received client connect for test namespace from %s" % str(self.environ['REMOTE_ADDR']))
print_log("Received client connect for test namespace from %s" % str(self.environ['REMOTE_ADDR']))
self.emit('test', "If you see this then you are connected to the test socket endpoint")
class JobNamespace(TowerBaseNamespace):
@@ -76,7 +79,7 @@ class JobNamespace(TowerBaseNamespace):
return ['summary_complete', 'status_changed']
def recv_connect(self):
print("Received client connect for job namespace from %s" % str(self.environ['REMOTE_ADDR']))
print_log("Received client connect for job namespace from %s" % str(self.environ['REMOTE_ADDR']))
class JobEventNamespace(TowerBaseNamespace):
@@ -87,11 +90,11 @@ class JobEventNamespace(TowerBaseNamespace):
else:
user_jobs = get_user_queryset(valid_user, Job).filter(finished__isnull=True)
visible_jobs = set(['recv_connect'] + ["job_events-%s" % str(j.id) for j in user_jobs])
print("Visible jobs: " + str(visible_jobs))
print_log("Visible jobs: " + str(visible_jobs))
return visible_jobs
def recv_connect(self):
print("Received client connect for job event namespace from %s" % str(self.environ['REMOTE_ADDR']))
print_log("Received client connect for job event namespace from %s" % str(self.environ['REMOTE_ADDR']))
class ScheduleNamespace(TowerBaseNamespace):
@@ -99,7 +102,7 @@ class ScheduleNamespace(TowerBaseNamespace):
return ["schedule_changed"]
def recv_connect(self):
print("Received client connect for schedule namespace from %s" % str(self.environ['REMOTE_ADDR']))
print_log("Received client connect for schedule namespace from %s" % str(self.environ['REMOTE_ADDR']))
class TowerSocket(object):