web/cryptpad
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix a race condition, shutdown the log when you're done

Browse Source
This commit is contained in:
ansuz
2019-06-13 11:22:20 +02:00
parent c0d908af4d
commit 5a1c25a0df
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
scripts/evict-inactive.js
View File

@@ -24,7 +24,7 @@ nThen(function (w) {
store = _; store = _;
})); // load the list of pinned files so you know which files })); // load the list of pinned files so you know which files
// should not be archived or deleted // should not be archived or deleted
Pinned.load(function (err, _) { Pinned.load(w(function (err, _) {
if (err) { if (err) {
w.abort(); w.abort();
return void console.error(err); return void console.error(err);
@@ -32,7 +32,7 @@ nThen(function (w) {
pins = _; pins = _;
}, { }, {
pinPath: config.pinPath, pinPath: config.pinPath,
}); }));
// load the logging module so that you have a record of which // load the logging module so that you have a record of which
// files were archived or deleted at what time // files were archived or deleted at what time
@@ -66,7 +66,6 @@ nThen(function (w) {
channel: item.channel, channel: item.channel,
}); });
} }
console.log("removed %s from cold storage", item.channel);
Log.info('EVICT_ARCHIVED_CHANNEL_REMOVAL', item.channel); Log.info('EVICT_ARCHIVED_CHANNEL_REMOVAL', item.channel);
removed++; removed++;
})); }));
@@ -146,5 +145,6 @@ nThen(function (w) {
}).nThen(function () { }).nThen(function () {
// the store will keep this script running if you don't shut it down // the store will keep this script running if you don't shut it down
store.shutdown(); store.shutdown();
Log.shutdown();
}); });