deps: upgrade prom-client

This commit is contained in:
Calvin Montgomery 2021-03-21 21:45:35 -07:00
parent 5f3d0859fd
commit 08c0cfcd58
2 changed files with 13 additions and 8 deletions

View File

@ -28,7 +28,7 @@
"morgan": "^1.10.0", "morgan": "^1.10.0",
"mysql": "^2.18.1", "mysql": "^2.18.1",
"nodemailer": "^6.5.0", "nodemailer": "^6.5.0",
"prom-client": "^10.0.2", "prom-client": "^13.1.0",
"proxy-addr": "^2.0.6", "proxy-addr": "^2.0.6",
"pug": "^3.0.2", "pug": "^3.0.2",
"redis": "^3.0.2", "redis": "^3.0.2",

View File

@ -5,7 +5,6 @@ import { parse as parseURL } from 'url';
const LOGGER = require('@calzoneman/jsli')('prometheus-server'); const LOGGER = require('@calzoneman/jsli')('prometheus-server');
let server = null; let server = null;
let defaultMetricsTimer = null;
export function init(prometheusConfig) { export function init(prometheusConfig) {
if (server !== null) { if (server !== null) {
@ -14,7 +13,7 @@ export function init(prometheusConfig) {
return; return;
} }
defaultMetricsTimer = collectDefaultMetrics(); collectDefaultMetrics();
server = http.createServer((req, res) => { server = http.createServer((req, res) => {
if (req.method !== 'GET' if (req.method !== 'GET'
@ -24,10 +23,18 @@ export function init(prometheusConfig) {
return; return;
} }
register.metrics().then(metrics => {
res.writeHead(200, { res.writeHead(200, {
'Content-Type': register.contentType 'Content-Type': register.contentType
}); });
res.end(register.metrics()); res.end(metrics);
}).catch(error => {
LOGGER.error('Error generating prometheus metrics: %s', error.stack);
res.writeHead(500, {
'Content-Type': 'text/plain'
});
res.end('Internal Server Error');
});
}); });
server.on('error', error => { server.on('error', error => {
@ -47,6 +54,4 @@ export function init(prometheusConfig) {
export function shutdown() { export function shutdown() {
server.close(); server.close();
server = null; server = null;
clearInterval(defaultMetricsTimer);
defaultMetricsTimer = null;
} }