public-mirrors/NewsBlur-viq
1
0
Fork 0
mirror of https://github.com/viq/NewsBlur.git synced 2025-04-13 09:38:09 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Turning logging down a bit in node servers unless debugging.

Browse source
This commit is contained in:
Samuel Clay 2021-03-19 11:16:29 -04:00
parent f797133943
commit 8ef854573c
8 changed files with 47 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
node/favicons.coffee
View file

@ -2,7 +2,8 @@ mongo = require 'mongodb'
log = require './log.js'
favicons = (app) =>
ENV_DEV = process.env.NODE_ENV == 'development'
ENV_DEBUG = process.env.NODE_ENV == 'debug'
ENV_DEV = process.env.NODE_ENV == 'development' or process.env.NODE_ENV == 'development'
ENV_PROD = process.env.NODE_ENV == 'production'
ENV_DOCKER = process.env.NODE_ENV == 'docker'
MONGODB_SERVER = "db_mongo"
@ -13,9 +14,11 @@ favicons = (app) =>
MONGODB_PORT = parseInt(process.env.MONGODB_PORT or 27017, 10)
log.debug "Starting NewsBlur Favicon server..."
if !ENV_DEV and !process.env.NODE_ENV
log.debug "Specify NODE_ENV=<development,docker,production>"
if !process.env.NODE_ENV
log.debug "Specify NODE_ENV=<debug,development,docker,production>"
return
else if ENV_DEBUG
log.debug "Running as debug favicons server"
else if ENV_DEV
log.debug "Running as development server"
else if ENV_DOCKER
@ -23,10 +26,10 @@ favicons = (app) =>
else
log.debug "Running as production server"
if ENV_DEV or ENV_DOCKER
url = "mongodb://#{MONGODB_SERVER}:#{MONGODB_PORT}/newsblur"
else
if ENV_PROD
url = "mongodb://#{MONGODB_SERVER}:#{MONGODB_PORT}/newsblur?replicaSet=nbset&readPreference=secondaryPreferred"
else
url = "mongodb://#{MONGODB_SERVER}:#{MONGODB_PORT}/newsblur"
do ->
try
@ -46,19 +49,23 @@ favicons = (app) =>
app.get /\/rss_feeds\/icon\/(\d+)\/?/, (req, res) =>
feed_id = parseInt(req.params[0], 10)
etag = req.header('If-None-Match')
log.debug "Feed: #{feed_id} " + if etag then " / #{etag}" else ""
if ENV_DEBUG
log.debug "Feed: #{feed_id} " + if etag then " / #{etag}" else ""
collection.findOne _id: feed_id, (err, docs) ->
if not err and etag and docs and docs?.color == etag
log.debug "Cached: #{feed_id}, etag: #{etag}/#{docs?.color} " + if err then "(err: #{err})" else ""
if ENV_DEBUG
log.debug "Cached: #{feed_id}, etag: #{etag}/#{docs?.color} " + if err then "(err: #{err})" else ""
res.sendStatus 304
else if not err and docs and docs.data
log.debug "Req: #{feed_id}, etag: #{etag}/#{docs?.color} " + if err then "(err: #{err})" else ""
if ENV_DEBUG
log.debug "Req: #{feed_id}, etag: #{etag}/#{docs?.color} " + if err then "(err: #{err})" else ""
res.header 'etag', docs.color
body = new Buffer(docs.data, 'base64')
res.set("Content-Type", "image/png")
res.status(200).send body
else
log.debug "Redirect: #{feed_id}, etag: #{etag}/#{docs?.color} " + if err then "(err: #{err})" else ""
if ENV_DEBUG
log.debug "Redirect: #{feed_id}, etag: #{etag}/#{docs?.color} " + if err then "(err: #{err})" else ""
if ENV_DEV
res.redirect '/media/img/icons/circular/world.png'
else

33
node/favicons.js
View file

@ -7,8 +7,9 @@
log = require('./log.js');
favicons = (app) => {
var ENV_DEV, ENV_DOCKER, ENV_PROD, MONGODB_PORT, MONGODB_SERVER, url;
ENV_DEV = process.env.NODE_ENV === 'development';
var ENV_DEBUG, ENV_DEV, ENV_DOCKER, ENV_PROD, MONGODB_PORT, MONGODB_SERVER, url;
ENV_DEBUG = process.env.NODE_ENV === 'debug';
ENV_DEV = process.env.NODE_ENV === 'development' || process.env.NODE_ENV === 'development';
ENV_PROD = process.env.NODE_ENV === 'production';
ENV_DOCKER = process.env.NODE_ENV === 'docker';
MONGODB_SERVER = "db_mongo";
@ -19,9 +20,11 @@
}
MONGODB_PORT = parseInt(process.env.MONGODB_PORT || 27017, 10);
log.debug("Starting NewsBlur Favicon server...");
if (!ENV_DEV && !process.env.NODE_ENV) {
log.debug("Specify NODE_ENV=<development,docker,production>");
if (!process.env.NODE_ENV) {
log.debug("Specify NODE_ENV=<debug,development,docker,production>");
return;
} else if (ENV_DEBUG) {
log.debug("Running as debug favicons server");
} else if (ENV_DEV) {
log.debug("Running as development server");
} else if (ENV_DOCKER) {
@ -29,10 +32,10 @@
} else {
log.debug("Running as production server");
}
if (ENV_DEV || ENV_DOCKER) {
url = `mongodb://${MONGODB_SERVER}:${MONGODB_PORT}/newsblur`;
} else {
if (ENV_PROD) {
url = `mongodb://${MONGODB_SERVER}:${MONGODB_PORT}/newsblur?replicaSet=nbset&readPreference=secondaryPreferred`;
} else {
url = `mongodb://${MONGODB_SERVER}:${MONGODB_PORT}/newsblur`;
}
return (async function() {
var client, collection, db, err;
@ -56,22 +59,30 @@
var etag, feed_id;
feed_id = parseInt(req.params[0], 10);
etag = req.header('If-None-Match');
log.debug(`Feed: ${feed_id} ` + (etag ? ` / ${etag}` : ""));
if (ENV_DEBUG) {
log.debug(`Feed: ${feed_id} ` + (etag ? ` / ${etag}` : ""));
}
return collection.findOne({
_id: feed_id
}, function(err, docs) {
var body;
if (!err && etag && docs && (docs != null ? docs.color : void 0) === etag) {
log.debug(`Cached: ${feed_id}, etag: ${etag}/${docs != null ? docs.color : void 0} ` + (err ? `(err: ${err})` : ""));
if (ENV_DEBUG) {
log.debug(`Cached: ${feed_id}, etag: ${etag}/${docs != null ? docs.color : void 0} ` + (err ? `(err: ${err})` : ""));
}
return res.sendStatus(304);
} else if (!err && docs && docs.data) {
log.debug(`Req: ${feed_id}, etag: ${etag}/${docs != null ? docs.color : void 0} ` + (err ? `(err: ${err})` : ""));
if (ENV_DEBUG) {
log.debug(`Req: ${feed_id}, etag: ${etag}/${docs != null ? docs.color : void 0} ` + (err ? `(err: ${err})` : ""));
}
res.header('etag', docs.color);
body = new Buffer(docs.data, 'base64');
res.set("Content-Type", "image/png");
return res.status(200).send(body);
} else {
log.debug(`Redirect: ${feed_id}, etag: ${etag}/${docs != null ? docs.color : void 0} ` + (err ? `(err: ${err})` : ""));
if (ENV_DEBUG) {
log.debug(`Redirect: ${feed_id}, etag: ${etag}/${docs != null ? docs.color : void 0} ` + (err ? `(err: ${err})` : ""));
}
if (ENV_DEV) {
return res.redirect('/media/img/icons/circular/world.png');
} else {

2
node/original_page.coffee
View file

@ -5,7 +5,7 @@ mkdirp = require 'mkdirp'
log = require './log.js'
original_page = (app) =>
DEV = process.env.NODE_ENV == 'development' || process.env.NODE_ENV == 'docker'
DEV = process.env.NODE_ENV == 'development' || process.env.NODE_ENV == 'docker' || process.env.NODE_ENV == 'debug'
DB_PATH = if DEV then 'originals' else '/srv/originals'

2
node/original_page.js
View file

@ -14,7 +14,7 @@
original_page = (app) => {
var DB_PATH, DEV, splitFeedId;
DEV = process.env.NODE_ENV === 'development' || process.env.NODE_ENV === 'docker';
DEV = process.env.NODE_ENV === 'development' || process.env.NODE_ENV === 'docker' || process.env.NODE_ENV === 'debug';
DB_PATH = DEV ? 'originals' : '/srv/originals';
app.use(busboy());
app.get(/^\/original_page\/(\d+)\/?/, (req, res) => {

4
node/original_text.coffee
View file

@ -2,11 +2,11 @@ Mercury = require('@postlight/mercury-parser')
log = require './log.js'
original_text = (app) =>
DEV = process.env.NODE_ENV == 'development' || process.env.NODE_ENV == 'docker'
DEV = process.env.NODE_ENV == 'development' or process.env.NODE_ENV == 'docker' or process.env.NODE_ENV == 'debug'
log.debug "Starting NewsBlur Original Text Fetcher / Mercury Parser..."
if !DEV and !process.env.NODE_ENV
log.debug "Specify NODE_ENV=<development,docker,production>"
log.debug "Specify NODE_ENV=<debug,development,docker,production>"
return
else if DEV
log.debug "Running as development server"

4
node/original_text.js
View file

@ -8,10 +8,10 @@
original_text = (app) => {
var DEV;
DEV = process.env.NODE_ENV === 'development' || process.env.NODE_ENV === 'docker';
DEV = process.env.NODE_ENV === 'development' || process.env.NODE_ENV === 'docker' || process.env.NODE_ENV === 'debug';
log.debug("Starting NewsBlur Original Text Fetcher / Mercury Parser...");
if (!DEV && !process.env.NODE_ENV) {
log.debug("Specify NODE_ENV=<development,docker,production>");
log.debug("Specify NODE_ENV=<debug,development,docker,production>");
return;
} else if (DEV) {
log.debug("Running as development server");

2
node/unread_counts.coffee
View file

@ -3,7 +3,7 @@ redis = require 'redis'
log = require './log.js'
unread_counts = (server) =>
ENV_DEV = process.env.NODE_ENV == 'development'
ENV_DEV = process.env.NODE_ENV == 'development' or process.env.NODE_ENV == 'debug'
ENV_PROD = process.env.NODE_ENV == 'production'
ENV_DOCKER = process.env.NODE_ENV == 'docker'
REDIS_SERVER = "db_redis"

2
node/unread_counts.js
View file

@ -10,7 +10,7 @@
unread_counts = (server) => {
var ENV_DEV, ENV_DOCKER, ENV_PROD, REDIS_PORT, REDIS_SERVER, SECURE, io;
ENV_DEV = process.env.NODE_ENV === 'development';
ENV_DEV = process.env.NODE_ENV === 'development' || process.env.NODE_ENV === 'debug';
ENV_PROD = process.env.NODE_ENV === 'production';
ENV_DOCKER = process.env.NODE_ENV === 'docker';
REDIS_SERVER = "db_redis";