monitor: interval, stats logging

index.js

@@ -55,7 +55,9 @@ const createApi = (hafas, config, attachMiddleware) => {
 	if ('docsLink' in config) assertNonEmptyString(config, 'docsLink')
 
 	const api = express()
-	api.locals.logger = pino()
+	api.locals.logger = pino({
+		level: process.env.LOGGING_LEVEL || 'info'
+	})
 
 	if (config.cors) {
 		const createCors = require('./cors')

package.json

@@ -37,9 +37,11 @@
 		"express": "^4.16.2",
 		"express-pino-logger": "^4.0.0",
 		"hafas-gtfs-rt-feed": "^0.2.0",
+		"hafas-monitor-trips": "^2.1.1",
 		"hafas-monitor-trips-server": "^1.0.0",
 		"hsts": "^2.1.0",
 		"length-prefixed-stream": "^2.0.0",
+		"lodash.throttle": "^4.1.1",
 		"markdown-it": "^9.0.1",
 		"nocache": "^2.0.0",
 		"parse-messy-time": "^2.1.0",
@@ -51,7 +53,7 @@
 	"devDependencies": {
 		"axios": "^0.19.0",
 		"get-port": "^5.0.0",
-		"hafas-client": "^4.0.1",
+		"hafas-client": "^4.5.1",
 		"pino-pretty": "^3.2.0",
 		"serve-static": "^1.13.2",
 		"tap-min": "^2.0.0",

routes/events.js

@@ -1,12 +1,15 @@
 'use strict'
 
 const createServer = require('hafas-monitor-trips-server')
+const createMonitor = require('hafas-monitor-trips')
 const SSE = require('ssestream')
 const createGtfsRtFeed = require('hafas-gtfs-rt-feed/writer')
 const encodeChunks = require('length-prefixed-stream/encode')
 const accepts = require('accepts')
+const throttle = require('lodash.throttle')
 const {parseNumber} = require('../lib/parse')
 
+const INTERVAL = parseInt(process.env.MONITOR_INTERVAL || 60) * 1000
 const EVENT_STREAM = 'text/event-stream'
 const GTFS_RT = 'application/x.length-prefixed-gtfs-rt'
 
@@ -56,7 +59,11 @@ const gtfsRtWriter = (req, res, evNames) => {
 }
 
 const createEventsRoute = (hafas, config) => {
-	const monitor = createServer(hafas)
+	const monitor = createServer(hafas, {
+		createMonitor: (hafas, bbox) => {
+			return createMonitor(hafas, bbox, INTERVAL)
+		}
+	})
 
 	const eventsRoute = (req, res, next) => {
 		const {logger} = req.app.locals
@@ -99,8 +106,13 @@ const createEventsRoute = (hafas, config) => {
 		})
 
 		logger.info({bbox}, 'starting monitor')
+		const logInfos = throttle((stats) => {
+			logger.info({...stats, bbox})
+		}, 10 * 1000)
+		sub.on('stats', logInfos)
 		res.once('close', () => {
 			logger.info({bbox}, 'stopping monitor')
+			sub.removeListener('stats', logInfos)
 			sub.destroy()
 		})