Skip to content

Commit fd65b83

Browse files
committed
Fix for missing key in closext block call
1 parent e78f36f commit fd65b83

File tree

1 file changed

+8
-19
lines changed

1 file changed

+8
-19
lines changed

src/block-cache-cluster.js

+8-19
Original file line numberDiff line numberDiff line change
@@ -90,14 +90,14 @@ if (cluster.isMaster) {
9090
}
9191
}
9292

93-
closestBlock (temps, filter, cb) {
93+
closestBlock (temps, key, filter, cb) {
9494
let worker = this._freeWorker()
9595
if (worker) {
9696
_callbacks.set(worker, cb)
97-
worker.send({type: 'content', temps, filter})
97+
worker.send({type: 'content', temps, key, filter})
9898
} else {
9999
let queue = _queue.get(this)
100-
queue.unshift({type: 'content', temps, filter, cb: cb})
100+
queue.unshift({type: 'content', temps, key, filter, cb: cb})
101101
}
102102
}
103103
_free(threadId) {
@@ -107,20 +107,9 @@ if (cluster.isMaster) {
107107
if (next) {
108108
let pool = _pool.get(this)
109109
let worker = pool.get(threadId)
110-
switch (next.type) {
111-
case 'content':
112-
_callbacks.set(worker, next.cb)
113-
worker.send({type: next.type, temps: next.temps})
114-
break
115-
case 'contentFilter':
116-
_callbacks.set(worker, next.cb)
117-
worker.send({type: next.type, temps: next.temps})
118-
break
119-
case 'closestBlock':
120-
_callbacks.set(worker, next.cb)
121-
worker.send({type: next.type, temps: next.temps, filter: next.filter})
122-
break
123-
}
110+
_callbacks.set(worker, next.cb)
111+
delete next.cb
112+
worker.send({...next})
124113
}
125114
})
126115
}
@@ -146,7 +135,7 @@ if (cluster.isMaster) {
146135
})
147136
break
148137
case 'closestBlock' :
149-
closestBlock (msg.temps, msg.filter, (err, key) => {
138+
closestBlock (msg.temps, msg.key, Buffer.from(msg.filter), (err, key) => {
150139
if (err) {
151140
return process.send({err: err})
152141
}
@@ -185,7 +174,7 @@ if (cluster.isMaster) {
185174
}
186175
})
187176
}
188-
function closestBlock (temps, filter, cb) {
177+
function closestBlock (temps, key, filter, cb) {
189178
content((err, content) => {
190179
if (err) {
191180
return cb(err)

0 commit comments

Comments
 (0)