Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix get after close #17

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix get after close #17

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 12 additions & 3 deletions index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,11 @@ exports.init = function (sbot, config) {
}

if(conf.hook !== false)
var closed = false
sbot.close.hook(function (fn, args) {
closed = true
return fn.apply(this, args)
})
sbot.get.hook(function (fn, args) {
var id = args[0]
var cb = args[1]
Expand All @@ -90,9 +95,13 @@ exports.init = function (sbot, config) {
if(id.ooo === false && isMsg(id.id)) fn(id, cb)
else
fn(id, function (err, value) {
if(!err) cb(null, value)
else get(id, function (_err, data) {
if(_err) fn(id, cb) //just in-case, try the log again
if(!err) return cb(null, value)
if (closed) return cb(err)
get(id, function (_err, data) {
if(_err) {
if (!closed) fn(id, cb) //just in-case, try the log again
else cb(_err)
}
else cb(null, id.meta === true ? data : data.value)
})
})
Expand Down