summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* make ssl workMatthias Radestock2011-04-072-75/+93
| | | | | | | ...and handle socket errors It turns out that for active sockets the messages sent by tcp and ssl sockets to the controlling process differ gratuitously.
* get heartbeat monitor to pause when it shouldMatthias Radestock2011-04-071-2/+2
| | | | | | | | | | | | | | | | | | | | | | | On 'default' we kick off another prim_inet:async_recv *before* handling the frame we've just received. This is done for performance reasons - essentially we are reading ahead - and leads to the following sequence of events: 1. receive memory alarm -> change state to 'blocking' 2. receive a 'publish' method frame 3. kick off another prim_inet:async_recv 4. handle frame, detecting that it is a 'publish' frame and thus changing the state to 'blocked' 5. receive the frame header for another frame (e.g. the message header, or could be something on another channel, or a heartbeat) 6. since the state is 'blocked' and we pause the heartbeat monitor and *don't* kick off another prim_inet:async_recv On this branch we don't read ahead since a) that would complicate the logic a fair bit, and b) we could end up draining a fair chunk of data from the socket, rather than just a frame header. As a result we need to make sure the heartbeat monitor gets paused as soon as we transition to the 'blocked' state.
* tweakMatthias Radestock2011-04-071-1/+1
|
* merge default into bug23559Matthias Radestock2011-04-06138-7682/+10008
|\
| * It is not an error if the file does not existMatthew Sackman2011-04-061-1/+4
| |
| * Merge bug24017 into default (again)Emile Joubert2011-04-051-2/+3
| |\
| | * UTF8strings come back as binaries.Simon MacMullen2011-04-051-2/+3
| | |
| * | Merged bug24017 into defaultEmile Joubert2011-04-051-5/+77
| |\ \ | | |/
| | * Reduce duplication.Simon MacMullen2011-04-041-4/+2
| | |
| | * Actually DTRT. Note that this knocks out the is_binary/1 check introduced in ↵Simon MacMullen2011-04-041-13/+30
| | | | | | | | | | | | 22bf9ebcaebf; however despite that changeset's comment this does not seem to be needed with R14B (or any other release I tested).
| | * Tweak comment after rereading it.Simon MacMullen2011-04-041-2/+4
| | |
| | * Describe the problem. That's half the battle, right?Simon MacMullen2011-04-041-4/+59
| | |
| * | merge headsAlexandru Scvortov2011-04-0514-173/+102
| |\ \
| | * \ Merge bug 24020 (rabbitmq-env warns if rabbitmq.conf exists)Simon MacMullen2011-04-041-1/+2
| | |\ \ | | | |/ | | |/|
| | | * Warn about config only if new config is absentEmile Joubert2011-04-041-1/+2
| | |/
| | * Merging bug23628 to defaultMatthew Sackman2011-04-011-11/+14
| | |\
| | | * 'shutdown' is only treated specially if the child is a supervisor (previous ↵Matthew Sackman2011-04-011-9/+8
| | | | | | | | | | | | | | | | behaviour was actually confused on this front). Some minor renaming, reordering, and inlining
| | | * Revert to trailing whitespace et al to reduce diff to Erlang's supervisorMatthew Sackman2011-04-011-52/+52
| | | |
| | | * reverting previous changes; treating {shutdown, _} exit reasons the same as ↵Vlad Alexandru Ionescu2011-03-311-80/+70
| | | | | | | | | | | | | | | | normal in supervisor2
| | | * adding reporting exception to supervisor2Vlad Alexandru Ionescu2011-03-301-5/+19
| | | |
| | * | merging bug22952 to defaultMatthew Sackman2011-04-015-18/+27
| | |\ \
| | | * \ Merge bug23997 (R12B compatibility broken due to gb_trees:map R13ism).Simon MacMullen2011-04-014-15/+25
| | | |\ \
| | | | * | Another read/1.Simon MacMullen2011-04-011-4/+4
| | | | | |
| | | | * | use mnesia:read/1 instead of read/3Alexandru Scvortov2011-04-011-4/+4
| | | | | |
| | | | * | fix some R12B-5ismsAlexandru Scvortov2011-04-012-5/+5
| | | | | |
| | | | * | remove R13ismsAlexandru Scvortov2011-03-293-7/+17
| | | | | |
| | | * | | Merge bug24007 into defaultDavid Wragg2011-04-013-119/+34
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | 'rabbitmqctl wait' can wait forever on broker failure
| | | * | | | Make sure Attempts does not go negative.Simon MacMullen2011-03-301-3/+2
| | | | | | |
| | * | | | | Unlink before exitEmile Joubert2011-04-011-1/+1
| | | | | | |
| | * | | | | Slimmer gatherer terminationEmile Joubert2011-03-314-14/+6
| | | |/ / / | | |/| | |
| | * | | | Merging bug24008 to defaultMatthew Sackman2011-03-313-118/+30
| | |\ \ \ \
| | | * \ \ \ merging bug23968 to defaultMatthew Sackman2011-03-313-118/+30
| | | |\ \ \ \ | | | | |/ / / | | | |/| | |
| | | | * | | Merge default into bug23968Matthew Sackman2011-03-2818-245/+727
| | | | |\ \ \
| | | | * | | | Rip out dedup cacheMatthew Sackman2011-03-181-101/+28
| | | | | | | |
| | | | * | | | Rip out msg_store:releaseMatthew Sackman2011-03-183-18/+2
| | | | | | | |
| | * | | | | | Don't transform markers when upgrading messagesEmile Joubert2011-03-311-1/+4
| | |/ / / / /
| | * | | | | Make rabbitmq-server compilable.Simon MacMullen2011-03-301-2/+2
| | | | | | |
| | * | | | | merge bug23993 into default (OCF script is broken when specifying an ↵Alexandru Scvortov2011-03-304-146/+142
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | alternative config file)
| | | * | | | | cosmetic: put 'rabbitmqctl wait' code in the right placeMatthias Radestock2011-03-301-3/+7
| | | | | | | |
| | | * | | | | Shutup, dialyzerMatthew Sackman2011-03-301-2/+7
| | | | |_|_|/ | | | |/| | |
| | * | | | | Correct test for existance of config fileMatthew Sackman2011-03-251-4/+4
| | | |_|/ / | | |/| | |
| * | | | | Merge bug 23998 (prelaunch dies with "unexpected epmd error: address")Simon MacMullen2011-04-052-120/+81
| |\ \ \ \ \
| | * \ \ \ \ Merge bug22005 into defaultSteve Powell2011-04-050-0/+0
| | |\ \ \ \ \ | | | |_|/ / / | | |/| | | |
| | | * | | | Merge with defaultRob Harrop2011-03-210-0/+0
| | | |\ \ \ \
| | | | * \ \ \ Merge with defaultRob Harrop2011-03-210-0/+0
| | | | |\ \ \ \ | | | | | |_|/ / | | | | |/| | |
| | * | | | | | cosmeticMatthias Radestock2011-03-301-70/+60
| | | | | | | |
| | * | | | | | test refactor: mock the writer only onceMatthias Radestock2011-03-301-33/+11
| | | | | | | |
| | * | | | | | cosmeticMatthias Radestock2011-03-291-17/+10
| | | |_|_|_|/ | | |/| | | |
| * | | | | | Remove gratuitous export.Simon MacMullen2011-04-051-1/+1
| | | | | | |
| * | | | | | Finishing touches.Marek Majkowski2011-03-291-11/+6
| | | | | | |