Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
S
siibra-explorer
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Wiki
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Xiao Gui
siibra-explorer
Commits
456ad8e1
Commit
456ad8e1
authored
4 years ago
by
Xiao Gui
Browse files
Options
Downloads
Patches
Plain Diff
feat: add dataset init ready flag
parent
99635bfd
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
deploy/app.js
+3
-1
3 additions, 1 deletion
deploy/app.js
deploy/datasets/index.js
+11
-2
11 additions, 2 deletions
deploy/datasets/index.js
with
14 additions
and
3 deletions
deploy/app.js
+
3
−
1
View file @
456ad8e1
...
...
@@ -8,6 +8,7 @@ const crypto = require('crypto')
const
cookieParser
=
require
(
'
cookie-parser
'
)
const
{
router
:
regionalFeaturesRouter
,
regionalFeatureIsReady
}
=
require
(
'
./regionalFeatures
'
)
const
{
router
:
datasetRouter
,
ready
:
datasetRouteIsReady
}
=
require
(
'
./datasets
'
)
const
LOCAL_CDN_FLAG
=
!!
process
.
env
.
PRECOMPUTED_SERVER
...
...
@@ -167,9 +168,11 @@ app.use('/logo', require('./logo'))
app
.
get
(
'
/ready
'
,
async
(
req
,
res
)
=>
{
const
authIsReady
=
await
authReady
()
const
regionalFeatureReady
=
await
regionalFeatureIsReady
()
const
datasetReady
=
await
datasetRouteIsReady
()
const
allReady
=
[
authIsReady
,
regionalFeatureReady
,
datasetReady
,
/**
* add other ready endpoints here
* call sig is await fn(): boolean
...
...
@@ -205,7 +208,6 @@ const jsonMiddleware = (req, res, next) => {
const
atlasesRouter
=
require
(
'
./atlas
'
)
const
templateRouter
=
require
(
'
./templates
'
)
const
nehubaConfigRouter
=
require
(
'
./nehubaConfig
'
)
const
datasetRouter
=
require
(
'
./datasets
'
)
const
pluginRouter
=
require
(
'
./plugins
'
)
const
previewRouter
=
require
(
'
./preview
'
)
...
...
This diff is collapsed.
Click to expand it.
deploy/datasets/index.js
+
11
−
2
View file @
456ad8e1
...
...
@@ -15,13 +15,19 @@ const bodyParser = require('body-parser')
datasetsRouter
.
use
(
bodyParser
.
urlencoded
({
extended
:
false
}))
datasetsRouter
.
use
(
bodyParser
.
json
())
let
readyFlag
=
false
init
()
.
then
(()
=>
console
.
log
(
`dataset init success`
))
.
then
(()
=>
{
console
.
log
(
`dataset init success`
)
readyFlag
=
true
})
.
catch
(
e
=>
{
console
.
warn
(
`dataset init failed`
,
e
)
retry
(()
=>
init
())
})
const
ready
=
async
()
=>
readyFlag
const
cacheMaxAge24Hr
=
(
_req
,
res
,
next
)
=>
{
const
oneDay
=
24
*
60
*
60
res
.
setHeader
(
'
Cache-Control
'
,
`max-age=
${
oneDay
}
`
)
...
...
@@ -243,4 +249,7 @@ datasetsRouter.post('/bulkDownloadKgFiles', bodyParser.urlencoded({ extended: fa
}
})
module
.
exports
=
datasetsRouter
module
.
exports
=
{
router
:
datasetsRouter
,
ready
}
This diff is collapsed.
Click to expand it.
Preview
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment