Jared Tabor
e80c99e737
removing status checks in socket.service
2016-10-05 10:35:55 -07: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
Jared Tabor
a091069d9d
Move socket helper to a service and remove old code
2016-10-04 14:16:59 -07:00
Jared Tabor
3d979bb661
draft 1 of socket refactoring
2016-10-04 14:16:59 -07:00
Jared Tabor
e9b54dcd3c
switching socket.io-client for ReconnectingWebSocket library
2016-10-04 14:16:09 -07:00
Wayne Witzel III
6d4a2a8f8e
converting from socketio to channels websocket
2016-10-04 14:13:16 -07:00
Wayne Witzel III
1a9843d5d1
adding initial channels integration
2016-10-04 14:04:52 -07:00
Wayne Witzel III
e4c5b9cb18
Merge pull request #3642 from wwitzel3/channels-up
...
Merge dev and latest channels branch changes.
2016-10-03 10:47:54 -04:00
Wayne Witzel III
0088c5a410
add asgi_amqp req
2016-10-03 10:43:44 -04:00
Wayne Witzel III
3fab2b63b9
dev non-clustering rabbitmq with lvc enabled
2016-10-03 10:42:52 -04:00
Wayne Witzel III
530a5c0c88
merging devel
2016-10-03 10:35:50 -04:00
Chris Meyers
b4c852cf53
change migration name to align with version semantic
2016-10-03 10:06:50 -04:00
Shane McDonald
15eaac049c
Add pycparser to SRC_ONLY_PKGS
...
Fixes stuff due to https://github.com/pyca/cryptography/issues/3187
2016-10-03 09:37:06 -04:00
Chris Meyers
203df91a5d
more robust test mode checking
2016-10-03 09:28:44 -04:00
Chris Meyers
9b451076fc
Merge pull request #3639 from chrismeyersfsu/improvement-workflows_root_endpoints
...
add workflow root endpoints
2016-10-03 08:30:29 -04:00
Chris Meyers
649bf08edf
add workflow root endpoints
2016-10-03 08:15:39 -04:00
Bill Nottingham
8677c5cceb
Merge pull request #3626 from wenottingham/devel
...
Update help text to reflect 3.0 remove: default change
2016-09-30 15:52:29 -04:00
Chris Church
70e489d62f
Save settings.LICENSE as dict instead of str.
2016-09-30 15:30:34 -04:00
Bill Nottingham
cc4025977f
Update help text to reflect 3.0 remove: default change
2016-09-29 17:01:11 -04:00
Chris Meyers
16ef45f096
Merge pull request #3624 from chrismeyersfsu/improvement-allow_simultaneous
...
Improvement allow simultaneous
2016-09-29 16:36:51 -04:00
Chris Meyers
9cafebd8db
remove job to jt allow_simultaneous dependency
...
* Foreshadowing of what's to come with the task manager. When deciding
on what job to run in our task manager, we can't depend on job template
fields. Otherwise, this would cost us a query.
2016-09-29 16:19:19 -04:00
Chris Meyers
1a60dd89bd
add back in removed method
2016-09-29 16:01:51 -04:00
Chris Meyers
ec2b0ac90d
add back in removed method
2016-09-29 16:01:15 -04:00
Matthew Jones
be18737802
Merge branch 'ha_installer' into devel
...
* ha_installer:
Fixing up some minor nits with ha setup playbook
Update postgres yum/apt repo locations
Add note about when to use short/long name
Setup playbook modifications for HA/Ramparts
2016-09-29 12:29:25 -04:00
Matthew Jones
a648beba90
Rev django security version
2016-09-29 12:03:06 -04:00
Matthew Jones
6b0e337886
Update postgres yum/apt repo locations
...
*Thanks postgres team
2016-09-29 11:25:08 -04:00
Chris Meyers
dd3c3c9f29
Merge branch 'feature-ha_task_manager' into devel
2016-09-29 10:27:17 -04:00