aboutsummaryrefslogtreecommitdiffstats
path: root/actioncable/lib/action_cable
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #23505 from kaspth/inject-rails-config-through-railtieKasper Timm Hansen2016-02-142-11/+10
|\ | | | | Inject Rails related configuration through Railtie
| * Default connection class to ActionCable::Connection::Base.Kasper Timm Hansen2016-02-142-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 Hansen2016-02-142-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 Kamizono2016-02-132-2/+2
| |
* | Merge remote-tracking branch 'origin/master' into actioncable_loggingkp2016-02-1014-105/+349
|\|
| * Allow for non-standard redis connectorsDavid Heinemeier Hansson2016-02-042-3/+15
| |
| * [ci skip] Several ActionCable documentation updates:Nick Quaranto2016-02-024-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.beta2Sean Griffin2016-02-011-1/+1
| |
| * Switch the default redis adapter to a single-stream modelMatthew Draper2016-02-012-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.
| * Handle more IO errors (especially, ECONNRESET)Matthew Draper2016-01-301-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 ServerMatthew Draper2016-01-305-15/+47
| | | | | | | | They're all at risk of races on the first requests.
| * Fix arguments to on_closeMatthew Draper2016-01-302-5/+3
| |
| * Revert "Revert "Eliminate the EventMachine dependency""Matthew Draper2016-01-3016-46/+349
| |
| * Revert "Eliminate the EventMachine dependency"David Heinemeier Hansson2016-01-2716-349/+46
| |
* | Logs successful and invalid connections separatelykp2016-02-101-8/+12
| |
* | adds debug logging to actioncable connectkp2016-01-261-2/+12
|/
* Merge branch '5-0-beta-sec'Aaron Patterson2016-01-251-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 versionAaron Patterson2016-01-251-1/+1
| |
* | Merge pull request #23185 from droptheplot/actioncable-custom-channelsKasper Timm Hansen2016-01-241-3/+5
|\ \ | | | | | | ActionCable: Allow adding custom paths for channels
| * | Rename channels_path var and fix channel_paths method for ActionCable configSergey Novikov2016-01-231-5/+5
| | |
| * | Allow adding custom paths for action_cable channelsSergey Novikov2016-01-221-2/+4
| | |
* | | Ditch the EM error logging helperMatthew Draper2016-01-241-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-websocketMatthew Draper2016-01-247-21/+321
| | | | | | | | | | | | (as adapted to use concurrent-ruby / nio4r instead of eventmachine)
* | | Using a hacked faye-websocket, drop EventMachineMatthew Draper2016-01-249-22/+33
| | |
* | | Allow subscription adapters to be shut downMatthew Draper2016-01-244-14/+40
| | |
* | | Add Async and Inline adaptersMatthew Draper2016-01-242-0/+44
| | | | | | | | | | | | | | | Just like their ActiveJob equivalents, these only work within the current process.
* | | Normalize on no arguments for the success callbackMatthew Draper2016-01-242-2/+2
| | |
* | | Split internal subscriber tracking from Postgres adapterMatthew Draper2016-01-243-24/+70
| | |
* | | Use the correct reference to the redis connectionBrit Gardner2016-01-221-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-actioncableMatthew Draper2016-01-2013-42/+204
|\ \ | | | | | | | | | Adapterize storage for ActionCable
| * | Fix code review commentsJon Moss2016-01-189-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 / cleanupJon Moss2016-01-182-15/+16
| | | | | | | | | | | | | | | - Escape the channel name when subscribing in PG - Refactor popping the queue to make it easier to read
| * | ActionCable::StorageAdapter ==> ActionCable::SubscriptionAdapterJon Moss2016-01-187-14/+16
| | |
| * | All Redis deps are now optional, Postgres --> PostgreSQL adapterJon Moss2016-01-183-4/+14
| | |
| * | config_opts => cable, per @kaspthJon Moss2016-01-183-6/+7
| | |
| * | Listener no longer needs to be a singletonMatthew Draper2016-01-181-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 refactoringJon Moss2016-01-181-1/+1
| | |
| * | Blanket unsubscribe doesn't appear to be usedMatthew Draper2016-01-181-6/+2
| | |
| * | Don't execute callbacks on our main listener threadMatthew Draper2016-01-181-1/+1
| | |
| * | Pull the action methods directly onto the adapterMatthew Draper2016-01-188-56/+51
| | |
| * | Add Postgres adapterJon Moss2016-01-182-0/+110
| | |
| * | Refactor storage_adapterJon Moss2016-01-181-11/+3
| | |
| * | Adapterize ActionCable storage and extract behaviorJon Moss2016-01-1811-38/+93
|/ /
* | Fix the updated API (this sorts the concurrent-ruby switch with Basecamp)David Heinemeier Hansson2016-01-161-1/+1
| |
* | Revert "Merge pull request #22977 from rails/revert-22934-master"David Heinemeier Hansson2016-01-165-21/+44
| | | | | | | | | | This reverts commit d0393fccffc118a5de37654aa222774b66123393, reversing changes made to 3b7ccadfc1c8dfec61af898167e1300b17f5cf25.
* | [ci skip] Fix typo in docsDAVID MOORE2016-01-151-1/+1
| | | | | | | | | | Found this small omission while reviewing the ActionCable docs. [Dave Moore]
* | Revert "Move async execution from celluloid to concurrent-ruby"David Heinemeier Hansson2016-01-085-44/+21
| |
* | don't need explicit dep and a pretty neat pickMike Perham2016-01-051-1/+1
| |
* | Use Module#thread_mattr_accessorMike Perham2016-01-051-8/+6
| |
* | Move async execution from celluloid to concurrent-rubyMike Perham2016-01-055-21/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This removes 8 runtime gem dependencies from Rails: ``` Using hitimes 1.2.3 Using timers 4.1.1 Using celluloid-essentials 0.20.5 Using celluloid-extras 0.20.5 Using celluloid-fsm 0.20.5 Using celluloid-pool 0.20.5 Using celluloid-supervision 0.20.5 Using celluloid 0.17.2 ```