Skip to content

Commit

Permalink
Merge branch 'release/2.2' into feature/bulk-redis-payload-processing
Browse files Browse the repository at this point in the history
  • Loading branch information
StorytellerCZ authored Dec 12, 2024
2 parents 372e1e4 + 4cbbc02 commit b043082
Show file tree
Hide file tree
Showing 5 changed files with 68 additions and 61 deletions.
45 changes: 25 additions & 20 deletions .npm/package/npm-shrinkwrap.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

75 changes: 37 additions & 38 deletions .versions
Original file line number Diff line number Diff line change
@@ -1,68 +1,67 @@
[email protected].4
[email protected].1
[email protected].8
[email protected].4
alanning:[email protected]
aldeed:[email protected]
[email protected]
babel-compiler@7.9.2
babel-compiler@7.10.4
[email protected]
[email protected]
[email protected]
[email protected]
callback-hook@1.4.0
[email protected].1
cultofcoders:redis-oplog@2.1.1
[email protected].0
ddp-client@2.5.0
callback-hook@1.5.1
[email protected].2
cultofcoders:redis-oplog@2.2.0
[email protected].1
ddp-client@2.6.1
[email protected]
ddp-rate-limiter@1.1.0
ddp-server@2.5.0
[email protected].1
[email protected].2
[email protected].2
[email protected].0
ddp-rate-limiter@1.2.0
ddp-server@2.6.1
[email protected].2
[email protected].3
[email protected].7
[email protected].1
[email protected]
[email protected]
[email protected].2
[email protected].1
[email protected].1
[email protected].10
[email protected].3
[email protected].5
[email protected].3
[email protected].11
[email protected]
[email protected]
local-test:cultofcoders:redis-oplog@2.1.1
local-test:cultofcoders:redis-oplog@2.2.0
[email protected]
[email protected].1
[email protected].2
matb33:[email protected]
meteor@1.10.0
meteor@1.11.2
meteortesting:[email protected]
meteortesting:[email protected]
minimongo@1.8.0
[email protected].8
modules@0.18.0
[email protected].0
mongo@1.15.0
minimongo@1.9.3
[email protected].9
modules@0.19.0
[email protected].1
mongo@1.16.6
[email protected]
[email protected]
[email protected]
natestrauser:[email protected]
npm-mongo@4.3.1
npm-mongo@4.16.0
[email protected]
practicalmeteor:[email protected]
[email protected].0
[email protected].2
raix:[email protected]
[email protected].0
rate-limit@1.0.9
[email protected].3
[email protected].11
[email protected].1
rate-limit@1.1.1
[email protected].7
[email protected].12
[email protected]
[email protected]
reywood:[email protected]
[email protected]
[email protected]
[email protected]
[email protected].0
[email protected].1
tmeasday:[email protected]
tracker@1.2.0
[email protected].10
tracker@1.3.2
[email protected].13
[email protected]
[email protected].1
[email protected].0
[email protected].5
[email protected].1
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
- Updated `node-redis` to v3.1.2
- Updated `deep-extend` to v0.6.0
- Fix update not returning number
- Fix SyntheticMutator not applying `globalRedisPrefix`

### 2.1.1
- Fixes callback is not a function error when using SyntheticMutator.update
Expand Down
2 changes: 1 addition & 1 deletion lib/cache/lib/getChannels.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import getChannelName from '../../utils/getChannelName';

export default (collectionName, {namespace, channel, namespaces, channels}) => {
export default (collectionName, {namespace, channel, namespaces, channels} = {}) => {
let channelStrings = [];

if (namespaces) {
Expand Down
6 changes: 4 additions & 2 deletions lib/mongo/SyntheticMutator.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ import { EJSON } from 'meteor/ejson';
import getFields from '../utils/getFields';
import { Events, RedisPipe } from '../constants';
import containsOperators from '../mongo/lib/containsOperators';
import getChannels from '../cache/lib/getChannels';
import getDedicatedChannel from '../utils/getDedicatedChannel';

/**
* call(Mongo.Collection).insert(data)
Expand Down Expand Up @@ -92,9 +94,9 @@ export default class SyntheticMutator {
if (!Array.isArray(channels)) {
if (channels instanceof Mongo.Collection) {
const name = channels._name;
channels = [name];
channels = getChannels(name);
if (_id) {
channels.push(`${name}::${_id}`);
channels.push(getDedicatedChannel(name, _id));
}
} else {
channels = [channels];
Expand Down

0 comments on commit b043082

Please sign in to comment.