External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-01-11 10:00:01 -03:30
Code Issues Packages Projects Releases Wiki Activity
9,375 Commits 54 Branches 19 Tags
Commit Graph

9375 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alan Rominger
7bd19b8e98 Merge pull request #3687 from AlanCoding/wf_fixes 
Workflow serializer fixes
 2016-10-11 08:39:01 -04:00
AlanCoding
21a04f196c workflow serializer fixes 2016-10-10 17:13:02 -04:00
Ryan Fitzpatrick
d57c0152fb Include defaul channel layer route and upgrade amqp version (#3675) 2016-10-10 13:32:34 -04:00
Jake McDermott
cd896539f0 Merge pull request #3676 from jakemcdermott/noissue_fix_settings_migration 
use created and modified dates from TowerSettings when migrating to conf Settings
 2016-10-10 12:26:56 -04:00
Jake McDermott
47b2b4322b use created and modified dates from TowerSettings when migrating to conf Settings 2016-10-10 10:25:53 -04:00
Matthew Jones
2a844b9c42 Add api node request servicer to response headers 2016-10-07 11:40:44 -04:00
Wayne Witzel III
594fa8cf89 Merge pull request #3657 from wwitzel3/jtabor-sockets 
Switch to Django Channels
 2016-10-07 10:39:04 -04:00
Matthew Jones
20b5aa7424 Fix some issues with management commands for clustering 2016-10-07 09:58:47 -04:00
Wayne Witzel III
5d8e7c17c2 Merge branch 'devel' into jtabor-sockets 2016-10-07 09:50:03 -04:00
Wayne Witzel III
48d49b41cb revert to old rabbitmq 2016-10-07 09:46:57 -04:00
Jared Tabor
fa894c710b Merge pull request #2 from jaredevantabor/wwitzel3/jtabor-sockets 
Turning debug_mode to false
 2016-10-06 20:19:34 -07:00
Jared Tabor
3a1b4a10c8 Turning debug_mode to false 2016-10-06 20:15:15 -07:00
Jared Tabor
b99289c567 Merge pull request #1 from jaredevantabor/wwitzel3/jtabor-sockets 
Feedback from PR
 2016-10-06 18:46:25 -07:00
Jared Tabor
c6d5f751fb Feedback from PR 
specifically the scope that is used for attaching event listeners
for the $emit/$braodcast/$on that is used for routing socket messages.
Also removing some commented out code
 2016-10-06 18:42:18 -07:00
Wayne Witzel III
163ec843fd update channels reqs 2016-10-06 16:32:35 -04:00
Wayne Witzel III
39f337d933 added model for holding channel group information, updating asgi_amsqp req 2016-10-06 16:16:27 -04:00
Matthew Jones
babe29ebfa Implement cluster health checks 
* Add a local node queue to execute targeted jobs
* Add a setting for active cluster node id (per-node)
* Base the heartbeat time on the `modified` time on the Instance table
* Add periodic task that calls save() on the instance to update the
  heartbeat time if services are up
* Purge/update any ha/instance management commands
* Fix up CELERY_ROUTES settings data structure
 2016-10-06 16:05:39 -04:00
Jim Ladd
aabbd48d17 Merge pull request #3655 from jladdjr/no_issue_clean_tower_image_by_name 
Clean-up tower images by name
 2016-10-06 12:37:16 -04:00
Alan Rominger
cd8aeac5c3 Merge pull request #3644 from AlanCoding/3559_manual_proj 
Set `start` capability to False for manual projects
 2016-10-06 12:04:35 -04:00
Graham Mainwaring
3ffeb5b0ba Merge pull request #3656 from ghjm/scan_windows_fix 
Change names of Windows scan modules to avoid ambiguity
 2016-10-06 10:45:49 -04:00
Wayne Witzel III
9049fb208f Merge branch 'devel' of https://github.com/ansible/ansible-tower into jtabor-sockets 2016-10-06 10:06:30 -04:00
Wayne Witzel III
71c84a6383 convert scheduler to use websocket 2016-10-06 09:58:51 -04:00
Jared Tabor
1b8b4a68b7 Resubscribing the UI to the last group it was on, whenever a disconnect happens that 
was no intentional
 2016-10-05 14:10:40 -07:00
Graham Mainwaring
180209236e Change names of Windows scan modules to avoid ambiguity 2016-10-05 16:43:19 -04:00
Jared Tabor
e80c99e737 removing status checks in socket.service 2016-10-05 10:35:55 -07:00
Jim Ladd
89ae7ebe76 Clean docker images by name 2016-10-05 10:31:45 -04:00
Jared Tabor
5edd9e73c8 removing npm-shrinkwrap to avoid conflict 2016-10-04 16:24:58 -07:00
Jared Tabor
37e282735a fixing statusTip and socketStatus 2016-10-04 14:27:29 -07:00
Jared Tabor
849c48a101 committing first pass at unit test for SocketService 2016-10-04 14:27:29 -07:00
Jared Tabor
541f55fece removing shrinkwrap to avoid merge conflict for now 2016-10-04 14:26:48 -07:00
Leigh Johnson
a4f134b772 use a better-supported babel plugin instead of jank webpack loader for istanbul instrumentation (#3341) 2016-10-04 14:25:18 -07:00
Jared Tabor
77d5772a2e cleaning up jshint errors 2016-10-04 14:25:18 -07:00
Jared Tabor
4bb2234019 removing old code 2016-10-04 14:25:18 -07:00
Leigh Johnson
cf54fe27e6 Fix schedules sitewide (#3469) 
* Remove custom rrule module loaders, update angular-scheduler dept

* snip comment

* remove nlp module loaders
 2016-10-04 14:25:18 -07:00
Jared Tabor
5801d3cec8 changing naming scheme for event listeners to "ws-<group_name>" 
instead of ws-<state name>-<group_name>
 2016-10-04 14:23:39 -07:00
Jared Tabor
e0a566cdea adding socket coverage to child states 
so that child states won't unsubscribe the parent from any groups
 2016-10-04 14:23:39 -07:00
Jared Tabor
37b2b01e02 small fix to disconnect function--null pointer exception 2016-10-04 14:23:39 -07:00
Jared Tabor
4e533cc63b adding disconnect function for logging out 
and adding ability to specify `socket: null` for a route definition, in order to
specify a state that should not subscribe/unsubscribe at all (for login state).
 2016-10-04 14:23:39 -07:00
Jared Tabor
82d33d8686 fixing issue with adhoc stdout 
the adhoc stdout was subscribing to job_events instead of
ad_hoc_command_events
 2016-10-04 14:23:39 -07:00
Jared Tabor
0f32faec60 Changing naming convention for socket-message event listeners 
to use <stateName>-<group_name>
 2016-10-04 14:23:39 -07:00
Jared Tabor
f875d65ef7 Adding unsubscribe method for non-socket-enabled routes 
with the idea that we only want to unsubscribe directly following a subscribe
(no need to unsubscribe if we're already unsubscribed).
 2016-10-04 14:23:39 -07:00
Jared Tabor
1510d826a6 Sending blank object to socket server on routes that are not 
websocket enabled.
 2016-10-04 14:23:39 -07:00
Jared Tabor
947571fe26 Fixing live events for inventory-manage page 2016-10-04 14:23:39 -07:00
Jared Tabor
0fb4a1a62a Adding socket object to route definitions 
for stdout routes, as well as removing some old code
 2016-10-04 14:18:44 -07:00
Jared Tabor
aa4a8f6089 Hooking SocketService.subscribe function to $stateExtender 
so that socket rooms can be configured on each route that needs sockets s
 2016-10-04 14:18:44 -07:00
Leigh Johnson
5b1d4f3d67 remove websocket proxy from build-docker-machine script, freeze ui deps 2016-10-04 14:18:44 -07:00
Jared Tabor
9691e267df adding promise for successful socket connection 
in order to prevent the a race condition: the socket was trying to emit
messages to the API to subscribe to rooms before the socket connection was
finshed connectig.
 2016-10-04 14:16:59 -07:00
Jared Tabor
0937866e20 refactoring socket functions 2016-10-04 14:16:59 -07:00
Jared Tabor
813eeb9dd9 fixing socketservice init on login 2016-10-04 14:16:59 -07:00
Jared Tabor
e35b5ef6fb Adhoc stdout working with new websockets 2016-10-04 14:16:59 -07:00