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

Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging

Browse Source
This commit is contained in:
yflory 2019-10-01 14:18:51 +02:00
commit 5b75417a3b
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/example.nginx.conf
View File

@ -116,7 +116,7 @@ server {
try_files $uri =404; try_files $uri =404;
} }
location ~ ^/(register|login|settings|user|pad|drive|poll|slide|code|whiteboard|file|media|profile|contacts|todo|filepicker|debug|kanban|sheet)$ { location ~ ^/(register|login|settings|user|pad|drive|poll|slide|code|whiteboard|file|media|profile|contacts|todo|filepicker|debug|kanban|sheet|support|admin|notifications|teams)$ {
rewrite ^(.*)$ $1/ redirect; rewrite ^(.*)$ $1/ redirect;
} }

10
scripts/evict-inactive.js
View File

@ -25,6 +25,12 @@ var store;
var pins; var pins;
var Log; var Log;
var blobs; var blobs;
var startTime = +new Date();
var msSinceStart = function () {
return (+new Date()) - startTime;
};
nThen(function (w) { nThen(function (w) {
// load the store which will be used for iterating over channels // load the store which will be used for iterating over channels
// and performing operations like archival and deletion // and performing operations like archival and deletion
@ -57,6 +63,8 @@ nThen(function (w) {
} }
blobs = _; blobs = _;
})); }));
}).nThen(function () {
Log.info("EVICT_TIME_TO_LOAD_PINS", msSinceStart());
}).nThen(function (w) { }).nThen(function (w) {
// this block will iterate over archived channels and removes them // this block will iterate over archived channels and removes them
// if they've been in cold storage for longer than your configured archive time // if they've been in cold storage for longer than your configured archive time
@ -276,6 +284,8 @@ nThen(function (w) {
}; };
store.listChannels(handler, w(done)); store.listChannels(handler, w(done));
}).nThen(function (w) {
Log.info("EVICT_TIME_TO_RUN_SCRIPT", msSinceStart());
}).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();