split log files
This commit is contained in:
parent
41c4dbb774
commit
0360ba0dc1
|
@ -7,7 +7,9 @@ import fetch from '../utils/proxiedFetch';
|
||||||
import redis from '../data/redis';
|
import redis from '../data/redis';
|
||||||
import { getIPv6Subnet } from '../utils/ip';
|
import { getIPv6Subnet } from '../utils/ip';
|
||||||
import { Blacklist, Whitelist } from '../data/models';
|
import { Blacklist, Whitelist } from '../data/models';
|
||||||
import logger from './logger';
|
import { proxyLogger } from './logger';
|
||||||
|
|
||||||
|
const logger = proxyLogger;
|
||||||
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
|
@ -18,7 +18,22 @@ const logger = createLogger({
|
||||||
],
|
],
|
||||||
});
|
});
|
||||||
|
|
||||||
|
export const pixelLogger = createLogger({
|
||||||
|
transports: [
|
||||||
|
new transports.File({
|
||||||
|
level: 'info',
|
||||||
|
filename: './pixels.log',
|
||||||
|
maxsize: 10428800, // 10MB
|
||||||
|
colorize: false,
|
||||||
|
}),
|
||||||
|
],
|
||||||
|
});
|
||||||
|
|
||||||
export const proxyLogger = createLogger({
|
export const proxyLogger = createLogger({
|
||||||
|
format: format.combine(
|
||||||
|
format.splat(),
|
||||||
|
format.simple(),
|
||||||
|
),
|
||||||
transports: [
|
transports: [
|
||||||
new transports.File({
|
new transports.File({
|
||||||
level: 'info',
|
level: 'info',
|
||||||
|
|
|
@ -4,19 +4,12 @@
|
||||||
|
|
||||||
import express from 'express';
|
import express from 'express';
|
||||||
import bodyParser from 'body-parser';
|
import bodyParser from 'body-parser';
|
||||||
import cors from 'cors';
|
|
||||||
|
|
||||||
import session from '../../core/session';
|
import session from '../../core/session';
|
||||||
import passport from '../../core/passport';
|
import passport from '../../core/passport';
|
||||||
import { User } from '../../data/models';
|
import { User } from '../../data/models';
|
||||||
import { getIPFromRequest, getIPv6Subnet } from '../../utils/ip';
|
import { getIPFromRequest, getIPv6Subnet } from '../../utils/ip';
|
||||||
|
|
||||||
import {
|
|
||||||
MINUTE,
|
|
||||||
SECOND,
|
|
||||||
DAY,
|
|
||||||
} from '../../core/constants';
|
|
||||||
|
|
||||||
import me from './me';
|
import me from './me';
|
||||||
import mctp from './mctp';
|
import mctp from './mctp';
|
||||||
import pixel from './pixel';
|
import pixel from './pixel';
|
||||||
|
@ -42,8 +35,9 @@ router.use(session);
|
||||||
* (cut IPv6 to subnet to prevent abuse)
|
* (cut IPv6 to subnet to prevent abuse)
|
||||||
*/
|
*/
|
||||||
router.use(async (req, res, next) => {
|
router.use(async (req, res, next) => {
|
||||||
const { session } = req;
|
const { session: sess } = req;
|
||||||
const id = (session.passport && session.passport.user) ? session.passport.user : null;
|
const id = (sess.passport && sess.passport.user)
|
||||||
|
? sess.passport.user : null;
|
||||||
const ip = await getIPFromRequest(req);
|
const ip = await getIPFromRequest(req);
|
||||||
const trueIp = ip || '0.0.0.1';
|
const trueIp = ip || '0.0.0.1';
|
||||||
req.trueIp = trueIp;
|
req.trueIp = trueIp;
|
||||||
|
|
|
@ -12,7 +12,7 @@ import {
|
||||||
strongDetector,
|
strongDetector,
|
||||||
} from '../../core/isProxy';
|
} from '../../core/isProxy';
|
||||||
import verifyCaptcha from '../../utils/recaptcha';
|
import verifyCaptcha from '../../utils/recaptcha';
|
||||||
import logger from '../../core/logger';
|
import logger, { pixelLogger } from '../../core/logger';
|
||||||
import redis from '../../data/redis';
|
import redis from '../../data/redis';
|
||||||
import {
|
import {
|
||||||
USE_PROXYCHECK,
|
USE_PROXYCHECK,
|
||||||
|
@ -193,7 +193,15 @@ async function place(req: Request, res: Response) {
|
||||||
const { user, trueIp } = req;
|
const { user, trueIp } = req;
|
||||||
|
|
||||||
// eslint-disable-next-line max-len
|
// eslint-disable-next-line max-len
|
||||||
logger.info(`${trueIp} / ${user.id} wants to place ${clr} in (${x}, ${y}, ${z}) on canvas ${cn}`);
|
pixelLogger.info({
|
||||||
|
ip: trueIp,
|
||||||
|
id: user.id,
|
||||||
|
cn,
|
||||||
|
x,
|
||||||
|
y,
|
||||||
|
z,
|
||||||
|
clr,
|
||||||
|
});
|
||||||
|
|
||||||
const {
|
const {
|
||||||
errorTitle, error, success, waitSeconds, coolDownSeconds,
|
errorTitle, error, success, waitSeconds, coolDownSeconds,
|
||||||
|
|
Loading…
Reference in New Issue
Block a user