Skip to content
Snippets Groups Projects
Commit 61944863 authored by david.bauer's avatar david.bauer :fire: Committed by david.bauer
Browse files

Update logging, okteto setup and dependencies

parent 7f8077d8
No related branches found
No related tags found
No related merge requests found
NODE_ENV=production
CACHE_TTL=30000
PORT=8080
LOG_LEVEL=info
......
name: develop-core-manifest-service
image: node:14-alpine
name: main-core-manifest-service
image: node:17-alpine
command: ["sh", "okteto-entrypoint.sh"]
workdir: /app
persistentVolume:
enabled: false
storageClass: longhorn
size: 2Gi
size: 1Gi
resources:
requests:
memory: "256Mi"
limits:
memory: "256Mi"
memory: "512Mi"
sync:
- .:/app
forward:
- 8080:8080
environment:
- LOG_LEVEL=debug
- NODE_ENV=development
......@@ -7,7 +7,7 @@
"scripts": {
"lint": "eslint .",
"start": "node src/index.js",
"dev": "nodemon index.js | pino-pretty",
"dev": "nodemon index.js",
"prepare": "husky install",
"test": "LOG_LEVEL=error NODE_OPTIONS=--experimental-vm-modules jest --no-cache"
},
......@@ -15,8 +15,8 @@
"license": "CC-BY-NC-SA-2.5",
"dependencies": {
"@cloudnative/health-connect": "^2.1.0",
"@open-xchange/logging": "^0.0.5",
"dotenv-defaults": "^3.0.0",
"@open-xchange/logging": "^0.0.9",
"dotenv-defaults": "^5.0.0",
"eslint-config-standard": "^16.0.2",
"express": "^4.17.1",
"express-prom-bundle": "^6.4.1",
......@@ -41,7 +41,7 @@
"lint-staged": ">=10",
"mock-fs": "^5.0.0",
"nodemon": "^2.0.7",
"superagent": "^6.1.0",
"superagent": "^7.1.1",
"supertest": "^6.1.6"
},
"lint-staged": {
......
......@@ -6,7 +6,7 @@ import express from 'express'
import helmet from 'helmet'
// Fastest HTTP logger for Node.js in town
import { createHttpLogger } from '@open-xchange/logging'
import { httpLogger, logger } from './logger.js'
// Readiness and liveness checks middleware
import health from '@cloudnative/health-connect'
......@@ -21,7 +21,6 @@ import fs from 'fs'
import { getCSSDependenciesFor, getDependencies, getOxManifests, getVersion, loadViteManifests, viteManifestToDeps } from './manifests.js'
import { fileCache } from './files.js'
const { logger } = createHttpLogger
const ignorePaths = ['/ready', '/healthy']
const swaggerDocument = yaml.load(fs.readFileSync('./src/swagger.yaml', 'utf8'))
const bypass = (request) => ignorePaths.includes(request.path)
......@@ -54,7 +53,7 @@ export function createApp () {
healthCheck.registerStartupCheck(startupCheck)
// Application-level middleware
app.use(createHttpLogger())
app.use(httpLogger)
app.use((req, res, next) => {
const { sha256Sum } = fileCache.get(req.path)
res.locals.sha256Sum = sha256Sum
......
......@@ -2,11 +2,9 @@ import fetch from 'node-fetch'
import crypto from 'crypto'
import { config } from './config.js'
import promClient from 'prom-client'
import { getLogger } from '@open-xchange/logging'
import { logger } from './logger.js'
import { isJSFile } from './util.js'
const logger = getLogger()
async function fetchData (path, baseUrl, appendix) {
const response = await fetch(new URL(path, baseUrl))
if (!response.ok) throw new Error(`Error fetching file: ${path}`)
......
// Add env vars from files
// Note: actual env vars supersede .env file and .env file supersedes .env.defaults file
import { config } from 'dotenv-defaults'
import { getLogger } from '@open-xchange/logging'
import { logger } from './logger.js'
import { createApp } from './createApp.js'
import express from 'express'
const logger = getLogger()
config()
const root = express()
......
import { config } from 'dotenv-defaults'
import { createLogger, createHttpLogger } from '@open-xchange/logging'
config()
export const httpLogger = createHttpLogger()
export const logger = createLogger()
......@@ -4,9 +4,7 @@ import { URL } from 'url'
import { fileCache } from './files.js'
import { config } from './config.js'
import { hash } from './util.js'
import { getLogger } from '@open-xchange/logging'
const logger = getLogger()
import { logger } from './logger.js'
export const loadViteManifests = (() => {
let cachePromise
......
This diff is collapsed.
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment