zware/awx
1
0
Fork 0
mirror of https://github.com/ZwareBear/awx.git synced 2026-05-14 15:58:38 -05:00
Code Issues Packages Projects Releases Wiki Activity

fixed ui adhoc stdout socket endpoint and wrapping of std out

Browse Source
This commit is contained in:
John Mitchell
2015-05-21 11:28:23 -04:00
parent de850c48c6
commit e068f7bb7f
3 changed files with 28 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
awx/ui/static/js/app.js
+5 -5
View File
@@ -267,13 +267,13 @@ var tower = angular.module('Tower', [
features: ['FeaturesService', function(FeaturesService) {
return FeaturesService.get();
}],
jobEventsSocket: ['Socket', '$rootScope', function(Socket, $rootScope) {
if (!$rootScope.event_socket) {
$rootScope.event_socket = Socket({
adhocEventsSocket: ['Socket', '$rootScope', function(Socket, $rootScope) {
if (!$rootScope.adhoc_event_socket) {
$rootScope.adhoc_event_socket = Socket({
scope: $rootScope,
endpoint: "job_events"
endpoint: "ad_hoc_command_events"
});
$rootScope.event_socket.init();
$rootScope.adhoc_event_socket.init();
return true;
} else {
return true;
awx/ui/static/js/controllers/JobStdout.js
+17 -7
View File
@@ -33,13 +33,23 @@ export function JobStdoutController ($location, $log, $rootScope, $scope, $compi
function openSockets() {
$log.debug("socket watching on job_events-" + job_id);
$rootScope.event_socket.on("job_events-" + job_id, function() {
$log.debug("socket fired on job_events-" + job_id);
if (api_complete) {
event_queue++;
}
});
if (/\/jobs\/(\d)+\/stdout/.test($location.$$url)) {
$log.debug("socket watching on job_events-" + job_id);
$rootScope.event_socket.on("job_events-" + job_id, function() {
$log.debug("socket fired on job_events-" + job_id);
if (api_complete) {
event_queue++;
}
});
} else if (/\/ad_hoc_commands\/(\d)+/.test($location.$$url)) {
$log.debug("socket watching on ad_hoc_command_events-" + job_id);
$rootScope.adhoc_event_socket.on("ad_hoc_command_events-" + job_id, function() {
$log.debug("socket fired on ad_hoc_command_events-" + job_id);
if (api_complete) {
event_queue++;
}
});
}
}
openSockets();