Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #23505 from kaspth/inject-rails-config-through-railtie | Kasper Timm Hansen | 2016-02-14 | 2 | -11/+10 |
|\ | | | | | Inject Rails related configuration through Railtie | ||||
| * | Default connection class to ActionCable::Connection::Base. | Kasper Timm Hansen | 2016-02-14 | 2 | -2/+6 |
| | | | | | | | | | | | | | | Instead of depending on ApplicationCable::Connection being defined at initialize we should inject it in the Railtie. Thus we can kill more setup in the tests too. | ||||
| * | Inject Rails' channel paths in engine. | Kasper Timm Hansen | 2016-02-14 | 2 | -9/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | We were explicitly referencing Rails.root in ActionCable::Server::Configuration.initialize, thereby coupling ourselves to Rails. Instead add `app/channels` to Rails' app paths and assign the existent files to `channel_paths`. Users can still append to those load paths with `<<` and `push` in `config/application.rb`. This means we can remove the custom `Dir` lookup in `channel_paths` and the Rails and root definitions in the tests. | ||||
* | | Fix grammar `a` to `an` [ci skip] | Ryuta Kamizono | 2016-02-13 | 2 | -2/+2 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into actioncable_logging | kp | 2016-02-10 | 21 | -446/+350 |
|\| | |||||
| * | don’t explicitly mention EventMachine [ci skip] | yuuji.yaginuma | 2016-02-05 | 1 | -1/+1 |
| | | | | | | | | Follow up to 6accef4e11b0c793e1c085536b5ed27f32b6a0c3 | ||||
| * | Allow for non-standard redis connectors | David Heinemeier Hansson | 2016-02-04 | 2 | -3/+15 |
| | | |||||
| * | [ci skip] Several ActionCable documentation updates: | Nick Quaranto | 2016-02-02 | 4 | -40/+53 |
| | | | | | | | | | | | | | | | | * Properly indent code sample in ActionCable::Channel::Streams * Add a doc comment for #stop_all_streams * Reformat + add <tt> blocks around code references in ActionCable::Base docs * Clarify and a little better grammar on ActionCable::RemoteConnections * Correct indentation and clean up ActionCable::Server::Broadcasting code sample | ||||
| * | Preparing for Rails 5.0.0.beta2 | Sean Griffin | 2016-02-01 | 1 | -1/+1 |
| | | |||||
| * | Merge pull request #23381 from matthewd/uneventful-redis | Matthew Draper | 2016-02-02 | 2 | -30/+193 |
| |\ | | | | | | | Redis sans EventMachine | ||||
| | * | Switch the default redis adapter to a single-stream model | Matthew Draper | 2016-02-01 | 2 | -30/+193 |
| | | | | | | | | | | | | | | | | | | This new adapter does get a little more intimate with the redis-rb gem's implementation than I would like, but it's the least bad of the approaches I've come up with. | ||||
| * | | Improvements and reorganization of assets | Jon Moss | 2016-01-30 | 7 | -341/+0 |
| | | | |||||
| * | | Add task to create precompiled action_cable.js and reorganize to accommodate | Javan Makhmali | 2016-01-30 | 7 | -5/+6 |
| |/ | |||||
| * | Handle more IO errors (especially, ECONNRESET) | Matthew Draper | 2016-01-30 | 1 | -21/+47 |
| | | | | | | | | | | | | Also, address the possibility of the listen thread dying and needing to be respawned. As a bonus, we now defer construction of the thread until we are first given something to monitor. | ||||
| * | Synchronize the lazy setters in Server | Matthew Draper | 2016-01-30 | 5 | -15/+47 |
| | | | | | | | | They're all at risk of races on the first requests. | ||||
| * | Fix arguments to on_close | Matthew Draper | 2016-01-30 | 2 | -5/+3 |
| | | |||||
| * | Revert "Revert "Eliminate the EventMachine dependency"" | Matthew Draper | 2016-01-30 | 16 | -46/+349 |
| | | |||||
| * | Revert "Eliminate the EventMachine dependency" | David Heinemeier Hansson | 2016-01-27 | 16 | -349/+46 |
| | | |||||
* | | Logs successful and invalid connections separately | kp | 2016-02-10 | 1 | -8/+12 |
| | | |||||
* | | adds debug logging to actioncable connect | kp | 2016-01-26 | 1 | -2/+12 |
|/ | |||||
* | Merge branch '5-0-beta-sec' | Aaron Patterson | 2016-01-25 | 1 | -1/+1 |
|\ | | | | | | | | | | | | | | | | | | | | | * 5-0-beta-sec: bumping version fix version update task to deal with .beta1.1 Eliminate instance level writers for class accessors allow :file to be outside rails root, but anything else must be inside the rails view directory Don't short-circuit reject_if proc stop caching mime types globally use secure string comparisons for basic auth username / password | ||||
| * | bumping version | Aaron Patterson | 2016-01-25 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #23185 from droptheplot/actioncable-custom-channels | Kasper Timm Hansen | 2016-01-24 | 1 | -3/+5 |
|\ \ | | | | | | | ActionCable: Allow adding custom paths for channels | ||||
| * | | Rename channels_path var and fix channel_paths method for ActionCable config | Sergey Novikov | 2016-01-23 | 1 | -5/+5 |
| | | | |||||
| * | | Allow adding custom paths for action_cable channels | Sergey Novikov | 2016-01-22 | 1 | -2/+4 |
| | | | |||||
* | | | Ditch the EM error logging helper | Matthew Draper | 2016-01-24 | 1 | -8/+0 |
| | | | | | | | | | | | | | | | | | | We're no longer doing our work in the EM event loop, so errors are quite unlikely, and if they do occur, they're not really our responsibility to handle. | ||||
* | | | Import the relevant portions of faye-websocket | Matthew Draper | 2016-01-24 | 7 | -21/+321 |
| | | | | | | | | | | | | (as adapted to use concurrent-ruby / nio4r instead of eventmachine) | ||||
* | | | Using a hacked faye-websocket, drop EventMachine | Matthew Draper | 2016-01-24 | 9 | -22/+33 |
| | | | |||||
* | | | Allow subscription adapters to be shut down | Matthew Draper | 2016-01-24 | 4 | -14/+40 |
| | | | |||||
* | | | Add Async and Inline adapters | Matthew Draper | 2016-01-24 | 2 | -0/+44 |
| | | | | | | | | | | | | | | | Just like their ActiveJob equivalents, these only work within the current process. | ||||
* | | | Normalize on no arguments for the success callback | Matthew Draper | 2016-01-24 | 2 | -2/+2 |
| | | | |||||
* | | | Split internal subscriber tracking from Postgres adapter | Matthew Draper | 2016-01-24 | 3 | -24/+70 |
| | | | |||||
* | | | Use the correct reference to the redis connection | Brit Gardner | 2016-01-22 | 1 | -1/+1 |
|/ / | | | | | | | | | Fixes #23193 This was throwing `There was an exception - NameError(undefined local variable or method `hi_redis_conn' for #<ActionCable::SubscriptionAdapter::Redis:0x007fb1449e2b70>)` on unsubscribe. | ||||
* | | Merge pull request #22950 from maclover7/adapterize-storage-actioncable | Matthew Draper | 2016-01-20 | 14 | -42/+205 |
|\ \ | | | | | | | | | | Adapterize storage for ActionCable | ||||
| * | | Fix code review comments | Jon Moss | 2016-01-18 | 9 | -46/+42 |
| | | | | | | | | | | | | | | | | | | | | | - adapter -> pubsub (re)rename internally - Change variable names to match method names - Add EventMachine `~> 1.0` as a runtime dependency of ActionCable - Refactor dependency loading for adapters | ||||
| * | | Small PostgreSQL adapter refactors / cleanup | Jon Moss | 2016-01-18 | 2 | -15/+16 |
| | | | | | | | | | | | | | | | - Escape the channel name when subscribing in PG - Refactor popping the queue to make it easier to read | ||||
| * | | ActionCable::StorageAdapter ==> ActionCable::SubscriptionAdapter | Jon Moss | 2016-01-18 | 8 | -15/+17 |
| | | | |||||
| * | | All Redis deps are now optional, Postgres --> PostgreSQL adapter | Jon Moss | 2016-01-18 | 3 | -4/+14 |
| | | | |||||
| * | | config_opts => cable, per @kaspth | Jon Moss | 2016-01-18 | 3 | -6/+7 |
| | | | |||||
| * | | Listener no longer needs to be a singleton | Matthew Draper | 2016-01-18 | 1 | -52/+58 |
| | | | | | | | | | | | | | | | | | | | | | We now only create one adapter instance for the server, so it can hold the listener. This in turn allows the listener to get the PG connection from the adapter, which will be a good place to allow more flexible configuration. | ||||
| * | | Tests passing and small refactoring | Jon Moss | 2016-01-18 | 1 | -1/+1 |
| | | | |||||
| * | | Blanket unsubscribe doesn't appear to be used | Matthew Draper | 2016-01-18 | 1 | -6/+2 |
| | | | |||||
| * | | Don't execute callbacks on our main listener thread | Matthew Draper | 2016-01-18 | 1 | -1/+1 |
| | | | |||||
| * | | Pull the action methods directly onto the adapter | Matthew Draper | 2016-01-18 | 8 | -56/+51 |
| | | | |||||
| * | | Add Postgres adapter | Jon Moss | 2016-01-18 | 2 | -0/+110 |
| | | | |||||
| * | | Refactor storage_adapter | Jon Moss | 2016-01-18 | 1 | -11/+3 |
| | | | |||||
| * | | Adapterize ActionCable storage and extract behavior | Jon Moss | 2016-01-18 | 12 | -38/+94 |
|/ / | |||||
* | | Fix the updated API (this sorts the concurrent-ruby switch with Basecamp) | David Heinemeier Hansson | 2016-01-16 | 1 | -1/+1 |
| | | |||||
* | | Revert "Merge pull request #22977 from rails/revert-22934-master" | David Heinemeier Hansson | 2016-01-16 | 5 | -21/+44 |
| | | | | | | | | | | This reverts commit d0393fccffc118a5de37654aa222774b66123393, reversing changes made to 3b7ccadfc1c8dfec61af898167e1300b17f5cf25. | ||||
* | | [ci skip] Fix typo in docs | DAVID MOORE | 2016-01-15 | 1 | -1/+1 |
| | | | | | | | | | | Found this small omission while reviewing the ActionCable docs. [Dave Moore] |