Skip to content

Commit 87cdb42

Browse files
authored
metrics: convert file.save from callback to promise (#3794)
1 parent aabcec3 commit 87cdb42

2 files changed

Lines changed: 17 additions & 18 deletions

File tree

ansible/roles/metrics/files/index-generator/index-generator.js

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ const express = require('express')
66
const app = express()
77
app.use(express.json())
88

9-
109
async function getFileList() {
1110

1211
let fileList = []
@@ -34,15 +33,14 @@ async function generateIndex() {
3433
body += (bodyString)
3534
}
3635

37-
indexfile = '<html>\n<head>\n</head>\n<body>\n' + body + '</body>\n</html>'
38-
39-
storage.bucket('access-logs-summaries-nodejs').file('index.html').save(indexfile, function (err) {
40-
if (err) {
41-
console.log('ERROR UPLOADING: ', err)
42-
} else {
43-
console.log('Upload complete')
44-
}
45-
})
36+
const fileContents = '<html>\n<head>\n</head>\n<body>\n' + body + '</body>\n</html>'
37+
const fileName = 'index.html'
38+
try {
39+
await storage.bucket('access-logs-summaries-nodejs').file(fileName).save(fileContents)
40+
console.log(`Upload complete: ${fileName}`)
41+
} catch (error) {
42+
console.error(`ERROR UPLOADING FILE: ${fileName} - ${error}`)
43+
}
4644
}
4745

4846
app.post('/', async (req, res) => {

ansible/roles/metrics/files/summaries/summaries.js

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -89,14 +89,15 @@ async function produceSummaries (date) {
8989
})
9090
await collectData(date)
9191
prepare()
92-
let outputFile = "nodejs.org-access.log." + date.toString() + ".json"
93-
storage.bucket('access-logs-summaries-nodejs').file(outputFile).save(JSON.stringify(counts), function (err) {
94-
if (err) {
95-
console.log('ERROR UPLOADING: ', err)
96-
} else {
97-
console.log('Upload complete')
98-
}
99-
})
92+
93+
const fileContents = JSON.stringify(counts)
94+
const fileName = `nodejs.org-access.log.${date.toString()}.json`
95+
try {
96+
await storage.bucket('access-logs-summaries-nodejs').file(fileName).save(fileContents)
97+
console.log(`Upload complete: ${fileName}`)
98+
} catch (error) {
99+
console.error(`ERROR UPLOADING FILE: ${fileName} - ${error}`)
100+
}
100101
}
101102

102103
app.post('/', async (req, res) => {

0 commit comments

Comments
 (0)