@openneuro/server 4.3.0-alpha.1 → 4.3.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/Dockerfile +1 -1
- package/package.json +2 -2
- package/src/app.js +0 -6
- package/src/datalad/snapshots.js +0 -3
- package/src/graphql/resolvers/dataset.js +0 -4
- package/src/libs/orcid.js +0 -2
- package/src/server.js +0 -7
package/Dockerfile
CHANGED
|
@@ -20,4 +20,4 @@ HEALTHCHECK --interval=10s --retries=10 CMD curl -f 'http://localhost:8111' || e
|
|
|
20
20
|
ENV NODE_OPTIONS=--max_old_space_size=2048
|
|
21
21
|
|
|
22
22
|
# start server
|
|
23
|
-
CMD ["
|
|
23
|
+
CMD ["node", "-r", "/srv/.pnp.cjs", "/srv/packages/openneuro-server/dist/server.js"]
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@openneuro/server",
|
|
3
|
-
"version": "4.3.0
|
|
3
|
+
"version": "4.3.0",
|
|
4
4
|
"description": "Core service for the OpenNeuro platform.",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"main": "src/server.js",
|
|
@@ -103,5 +103,5 @@
|
|
|
103
103
|
"publishConfig": {
|
|
104
104
|
"access": "public"
|
|
105
105
|
},
|
|
106
|
-
"gitHead": "
|
|
106
|
+
"gitHead": "2e777ea3f979e05dab85d612ea2b0788e699b96b"
|
|
107
107
|
}
|
package/src/app.js
CHANGED
|
@@ -5,7 +5,6 @@
|
|
|
5
5
|
* Express app setup
|
|
6
6
|
*/
|
|
7
7
|
import express from 'express'
|
|
8
|
-
import * as Sentry from '@sentry/node'
|
|
9
8
|
import passport from 'passport'
|
|
10
9
|
import config from './config'
|
|
11
10
|
import routes from './routes'
|
|
@@ -28,9 +27,6 @@ export default test => {
|
|
|
28
27
|
|
|
29
28
|
setupPassportAuth()
|
|
30
29
|
|
|
31
|
-
// Sentry must be first to work
|
|
32
|
-
test || app.use(Sentry.Handlers.requestHandler())
|
|
33
|
-
|
|
34
30
|
app.use(passport.initialize())
|
|
35
31
|
|
|
36
32
|
app.use((req, res, next) => {
|
|
@@ -48,8 +44,6 @@ export default test => {
|
|
|
48
44
|
app.use(config.apiPrefix, routes)
|
|
49
45
|
|
|
50
46
|
// error handling --------------------------------------------------\
|
|
51
|
-
// Sentry reporting passes to the next step
|
|
52
|
-
test || app.use(Sentry.Handlers.errorHandler())
|
|
53
47
|
|
|
54
48
|
// Apollo engine setup
|
|
55
49
|
const engineConfig = {
|
package/src/datalad/snapshots.js
CHANGED
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* Get snapshots from datalad-service tags
|
|
3
3
|
*/
|
|
4
|
-
import * as Sentry from '@sentry/node'
|
|
5
4
|
import request from 'superagent'
|
|
6
5
|
import { redis, redlock } from '../libs/redis'
|
|
7
6
|
import CacheItem, { CacheType } from '../cache/item'
|
|
@@ -61,7 +60,6 @@ const createIfNotExistsDoi = async (
|
|
|
61
60
|
if (snapshotDoi)
|
|
62
61
|
descriptionFieldUpdates['DatasetDOI'] = `doi:${snapshotDoi}`
|
|
63
62
|
} catch (err) {
|
|
64
|
-
Sentry.captureException(err)
|
|
65
63
|
console.error(err)
|
|
66
64
|
throw new Error('DOI minting failed.')
|
|
67
65
|
}
|
|
@@ -177,7 +175,6 @@ export const createSnapshot = async (
|
|
|
177
175
|
// this avoids inconsistent cache state after failures
|
|
178
176
|
snapshotCache.drop()
|
|
179
177
|
snapshotLock.unlock()
|
|
180
|
-
Sentry.captureException(err)
|
|
181
178
|
return err
|
|
182
179
|
}
|
|
183
180
|
}
|
|
@@ -17,7 +17,6 @@ import * as dataladAnalytics from '../../datalad/analytics.js'
|
|
|
17
17
|
import DatasetModel from '../../models/dataset'
|
|
18
18
|
import Deletion from '../../models/deletion'
|
|
19
19
|
import fetch from 'node-fetch'
|
|
20
|
-
import * as Sentry from '@sentry/node'
|
|
21
20
|
import { reviewers } from './reviewer'
|
|
22
21
|
import { UpdatedFile } from '../utils/file.js'
|
|
23
22
|
import { getDatasetWorker } from '../../libs/datalad-service.js'
|
|
@@ -165,7 +164,6 @@ export const deleteFiles = async (
|
|
|
165
164
|
|
|
166
165
|
return true
|
|
167
166
|
} catch (err) {
|
|
168
|
-
Sentry.captureException(err)
|
|
169
167
|
return false
|
|
170
168
|
}
|
|
171
169
|
}
|
|
@@ -187,7 +185,6 @@ export const removeAnnexObject = async (
|
|
|
187
185
|
)
|
|
188
186
|
return true
|
|
189
187
|
} catch (err) {
|
|
190
|
-
Sentry.captureException(err)
|
|
191
188
|
return false
|
|
192
189
|
}
|
|
193
190
|
}
|
|
@@ -208,7 +205,6 @@ export const flagAnnexObject = async (
|
|
|
208
205
|
)
|
|
209
206
|
return true
|
|
210
207
|
} catch (err) {
|
|
211
|
-
Sentry.captureException(err)
|
|
212
208
|
return false
|
|
213
209
|
}
|
|
214
210
|
}
|
package/src/libs/orcid.js
CHANGED
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
// Camel case rule is disabled since ORCID API uses snake case variables
|
|
2
2
|
import request from 'request'
|
|
3
3
|
import xmldoc from 'xmldoc'
|
|
4
|
-
import * as Sentry from '@sentry/node'
|
|
5
4
|
import config from '../config'
|
|
6
5
|
|
|
7
6
|
export default {
|
|
@@ -21,7 +20,6 @@ export default {
|
|
|
21
20
|
},
|
|
22
21
|
(err, res) => {
|
|
23
22
|
if (err) {
|
|
24
|
-
Sentry.captureException(err)
|
|
25
23
|
reject({
|
|
26
24
|
message:
|
|
27
25
|
'An unexpected ORCID login failure occurred, please try again later.',
|
package/src/server.js
CHANGED
|
@@ -4,7 +4,6 @@ apm.start({
|
|
|
4
4
|
serviceName: 'openneuro-server',
|
|
5
5
|
})
|
|
6
6
|
|
|
7
|
-
import * as Sentry from '@sentry/node'
|
|
8
7
|
import { createServer } from 'http'
|
|
9
8
|
import mongoose from 'mongoose'
|
|
10
9
|
import subscriptionServerFactory from './libs/subscription-server.js'
|
|
@@ -26,12 +25,6 @@ const redisConnectionSetup = async () => {
|
|
|
26
25
|
}
|
|
27
26
|
}
|
|
28
27
|
|
|
29
|
-
Sentry.init({
|
|
30
|
-
dsn: 'https://ba0c58863b3e40a2a412132bfd2711ea@sentry.io/251076',
|
|
31
|
-
release: version,
|
|
32
|
-
environment: config.sentry.ENVIRONMENT,
|
|
33
|
-
})
|
|
34
|
-
|
|
35
28
|
mongoose.connect(config.mongo.url, {
|
|
36
29
|
useNewUrlParser: true,
|
|
37
30
|
dbName: config.mongo.dbName,
|