From 8412da15db80a4299f39eecfaf8930a66661cac2 Mon Sep 17 00:00:00 2001 From: Joey King Date: Wed, 13 Jan 2021 07:51:08 -0600 Subject: [PATCH 1/3] Add logging storage params as env variables --- src/util/winston-logging.js | 7 +++++-- start-dev-example.sh | 6 ++++++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/src/util/winston-logging.js b/src/util/winston-logging.js index fd66813..d08f398 100644 --- a/src/util/winston-logging.js +++ b/src/util/winston-logging.js @@ -11,13 +11,16 @@ require('winston-daily-rotate-file') var NETWORK = process.env.NETWORK +var LOG_MAX_SIZE = process.env.LOG_MAX_SIZE ? process.env.LOG_MAX_SIZE : '1m' +var LOG_MAX_FILES = process.env.LOG_MAX_FILES ? process.env.LOG_MAX_FILES : '5d' + // Configure daily-rotation transport. var transport = new winston.transports.DailyRotateFile({ filename: `${__dirname}/../../logs/rest-${NETWORK}-%DATE%.log`, datePattern: 'YYYY-MM-DD', zippedArchive: false, - maxSize: '1m', - maxFiles: '5d', + maxSize: LOG_MAX_SIZE, + maxFiles: LOG_MAX_FILES, format: winston.format.combine( winston.format.timestamp(), winston.format.json() diff --git a/start-dev-example.sh b/start-dev-example.sh index c9bbcea..650b793 100755 --- a/start-dev-example.sh +++ b/start-dev-example.sh @@ -54,4 +54,10 @@ export ANON_RATE_LIMIT=50 # 10 = 100 RPM export WHITELIST_RATE_LIMIT=10 +# Set logging parameters +#1m means no more than 1 megabyte +export LOG_MAX_SIZE=1m +#5d means store no more than 5 days +export LOG_MAX_FILES=5d + npm start From 588feff5dbe655697f211a2f049bdfdb74190351 Mon Sep 17 00:00:00 2001 From: Chris Troutner Date: Wed, 13 Jan 2021 09:24:28 -0800 Subject: [PATCH 2/3] Added minor comments --- src/util/winston-logging.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/util/winston-logging.js b/src/util/winston-logging.js index d08f398..1843713 100644 --- a/src/util/winston-logging.js +++ b/src/util/winston-logging.js @@ -11,7 +11,10 @@ require('winston-daily-rotate-file') var NETWORK = process.env.NETWORK +// Default 1 Megabyte var LOG_MAX_SIZE = process.env.LOG_MAX_SIZE ? process.env.LOG_MAX_SIZE : '1m' + +// Default 5 days. var LOG_MAX_FILES = process.env.LOG_MAX_FILES ? process.env.LOG_MAX_FILES : '5d' // Configure daily-rotation transport. From 21b19b59c91cdbcba6c930a7f4dda6b2cba30f2d Mon Sep 17 00:00:00 2001 From: Chris Troutner Date: Wed, 13 Jan 2021 09:26:03 -0800 Subject: [PATCH 3/3] fix(logging): Adding env vars for configuring logging --- LICENSE.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LICENSE.md b/LICENSE.md index 90fff8b..cdcc7fd 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2020 Chris Troutner +Copyright (c) 2021 Permissionless Software Foundation Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal