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

Adhoc stdout working with new websockets

Browse Source
This commit is contained in:
Jared Tabor
2016-08-30 14:45:33 -07:00
parent a091069d9d
commit e35b5ef6fb
4 changed files with 3 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
awx/ui/client/src/app.js
View File

@@ -818,7 +818,7 @@ var tower = angular.module('Tower', [
console.log(toState.name); console.log(toState.name);
} }
else if(toState.name === 'adHocJobStdout'){ else if(toState.name === 'adHocJobStdout'){
SocketService.emit(`{"groups":{"ad_hoc_command_events": [${toParams.id}]}}`); SocketService.emit(`{"groups":{"jobs": ["status_changed"] , "ad_hoc_command_events": [${toParams.id}]}}`);
console.log(toState.name); console.log(toState.name);
} }
}); });

2
awx/ui/client/src/shared/socket/socket.service.js
View File

@@ -78,7 +78,7 @@ export default
$rootScope.$emit('ScheduleStatusChange', data); $rootScope.$emit('ScheduleStatusChange', data);
} }
if(data.group_name==="ad_hoc_command_events"){ if(data.group_name==="ad_hoc_command_events"){
$rootScope.$emit('ad_hoc_command_events-'+data.ad_hoc_command, data);
} }
if(data.group_name==="control"){ if(data.group_name==="control"){
$log.debug(data.reason); $log.debug(data.reason);

14
awx/ui/client/src/standard-out/adhoc/standard-out-adhoc.route.js
View File

@@ -17,19 +17,5 @@ export default {
}, },
data: { data: {
jobType: 'ad_hoc_commands' jobType: 'ad_hoc_commands'
},
resolve: {
adhocEventsSocket: ['Socket', '$rootScope', function(Socket, $rootScope) {
if (!$rootScope.adhoc_event_socket) {
$rootScope.adhoc_event_socket = Socket({
scope: $rootScope,
endpoint: "ad_hoc_command_events"
});
$rootScope.adhoc_event_socket.init();
return true;
} else {
return true;
}
}]
} }
}; };

2
awx/ui/client/src/standard-out/log/standard-out-log.controller.js
View File

@@ -36,7 +36,7 @@ export default ['$log', '$rootScope', '$scope', '$state', '$stateParams', 'Proce
} }
if ($state.current.name === 'adHocJobStdout') { if ($state.current.name === 'adHocJobStdout') {
$log.debug("socket watching on ad_hoc_command_events-" + job_id); $log.debug("socket watching on ad_hoc_command_events-" + job_id);
$rootScope.adhoc_event_socket.on("ad_hoc_command_events-" + job_id, function() { $rootScope.$on("ad_hoc_command_events-" + job_id, function() {
$log.debug("socket fired on ad_hoc_command_events-" + job_id); $log.debug("socket fired on ad_hoc_command_events-" + job_id);
if (api_complete) { if (api_complete) {
event_queue++; event_queue++;