日志文件修改

dist/index.js

@@ -3,13 +3,13 @@
 function _interopDefault (ex) { return (ex && (typeof ex === 'object') && 'default' in ex) ? ex['default'] : ex; }
 
 var restify = _interopDefault(require('restify'));
-var imagemin = _interopDefault(require('imagemin'));
-var imageminJpegtran = _interopDefault(require('imagemin-jpegtran'));
-var imageminPngquant = _interopDefault(require('imagemin-pngquant'));
 var Eurekaclient = _interopDefault(require('eureka-client-ts'));
 var log4js = require('log4js');
 var path = _interopDefault(require('path'));
 var fs = _interopDefault(require('fs-extra'));
+var imagemin = _interopDefault(require('imagemin'));
+var imageminJpegtran = _interopDefault(require('imagemin-jpegtran'));
+var imageminPngquant = _interopDefault(require('imagemin-pngquant'));
 
 /**
  * Created by rockyl on 2020-02-13.
@@ -21,11 +21,14 @@ fs.ensureDir(logPath);
 
 log4js.configure({
 	appenders: {
-		out: { type: 'console' },
-		allLog: { type: 'file', filename: path.join(logPath, 'log.log'), keepFileExt: true, maxLogSize: 10485760, backups: 3 },
+		out: {type: 'console'},
+		allLog: {
+			type: 'dateFile',
+			filename: path.join(logPath, 'log.log'),
+		},
 	},
 	categories: {
-		default: { appenders: ['out', 'allLog'], level: 'debug' },
+		default: {appenders: ['out', 'allLog'], level: 'debug'},
 	}
 
 });
@@ -51,30 +54,23 @@ async function getEurekaClient(port) {
 }
 
 /**
- * Created by rockyl on 2020-02-12.
+ * Created by rockyl on 2020-02-13.
  */
 
-let [_, __, port = '8090'] = process.argv;
-let eureka;
-port = parseInt(port);
-
 const acceptTypes = ['image/png', 'image/jpeg'];
 
-const server = restify.createServer({
-	name: 'tiny-image',
-	version: '1.0.0'
-});
-
-server.use(restify.plugins.acceptParser(server.acceptable));
-server.use(restify.plugins.queryParser());
-server.use(restify.plugins.bodyParser());
-
-server.get('/echo/:name', function (req, res, next) {
+function applyApi(server){
+	server.get('/echo/:name', function (req, res, next) {
 		res.send(req.params);
 		return next();
-});
+	});
+
+	server.get('/monitor/check', function (req, res, next) {
+		res.sendRaw('ok');
+		return next();
+	});
 
-server.post('/tinify', async function  (req, res, next) {
+	server.post('/tinify', async function  (req, res, next) {
 		logger.info('/tinify');
 
 		let file = req.files.file;
@@ -109,8 +105,28 @@ server.post('/tinify', async function  (req, res, next) {
 		}
 
 		return next();
+	});
+}
+
+/**
+ * Created by rockyl on 2020-02-12.
+ */
+
+let [_, __, port = '8090'] = process.argv;
+let eureka;
+port = parseInt(port);
+
+const server = restify.createServer({
+	name: 'tiny-image',
+	version: '1.0.0'
 });
 
+server.use(restify.plugins.acceptParser(server.acceptable));
+server.use(restify.plugins.queryParser());
+server.use(restify.plugins.bodyParser());
+
+applyApi(server);
+
 process.on('uncaughtException', (err) => {
 	logger.error(err);
 });

src/api.js

+/**
+ * Created by rockyl on 2020-02-13.
+ */
+
+import logger from "./logger";
+import imagemin from "imagemin";
+import imageminJpegtran from "imagemin-jpegtran";
+import imageminPngquant from "imagemin-pngquant";
+
+const acceptTypes = ['image/png', 'image/jpeg'];
+
+export default function applyApi(server){
+	server.get('/echo/:name', function (req, res, next) {
+		res.send(req.params);
+		return next();
+	});
+
+	server.get('/monitor/check', function (req, res, next) {
+		res.sendRaw('ok');
+		return next();
+	});
+
+	server.post('/tinify', async function  (req, res, next) {
+		logger.info('/tinify');
+
+		let file = req.files.file;
+
+		if(acceptTypes.includes(file.type)){
+			try {
+				const buffer = await imagemin([file.path], {
+					plugins: [
+						imageminJpegtran(),
+						imageminPngquant({
+							quality: [0.6, 0.8]
+						})
+					]
+				});
+
+				res.sendRaw(buffer[0].data, {
+					'Content-Type': file.type,
+				});
+			}catch (e) {
+				logger.error('/tinify', 'compress failed');
+				res.send({
+					code: 2,
+					msg: 'compress failed'
+				});
+			}
+		}else{
+			logger.error('/tinify', 'type error');
+			res.send({
+				code: 1,
+				msg: 'type error'
+			});
+		}
+
+		return next();
+	});
+}
\ No newline at end of file

src/index.js

@@ -3,18 +3,14 @@
  */
 
 import restify from 'restify';
-import imagemin from 'imagemin';
-import imageminJpegtran from 'imagemin-jpegtran';
-import imageminPngquant from 'imagemin-pngquant';
 import {getEurekaClient} from "./eureka";
 import logger from "./logger";
+import applyApi from "./api";
 
 let [_, __, port = '8090'] = process.argv;
 let eureka;
 port = parseInt(port);
 
-const acceptTypes = ['image/png', 'image/jpeg'];
-
 const server = restify.createServer({
 	name: 'tiny-image',
 	version: '1.0.0'
@@ -24,47 +20,7 @@ server.use(restify.plugins.acceptParser(server.acceptable));
 server.use(restify.plugins.queryParser());
 server.use(restify.plugins.bodyParser());
 
-server.get('/echo/:name', function (req, res, next) {
-	res.send(req.params);
-	return next();
-});
-
-server.post('/tinify', async function  (req, res, next) {
-	logger.info('/tinify');
-
-	let file = req.files.file;
-
-	if(acceptTypes.includes(file.type)){
-		try {
-			const buffer = await imagemin([file.path], {
-				plugins: [
-					imageminJpegtran(),
-					imageminPngquant({
-						quality: [0.6, 0.8]
-					})
-				]
-			});
-
-			res.sendRaw(buffer[0].data, {
-				'Content-Type': file.type,
-			});
-		}catch (e) {
-			logger.error('/tinify', 'compress failed');
-			res.send({
-				code: 2,
-				msg: 'compress failed'
-			});
-		}
-	}else{
-		logger.error('/tinify', 'type error');
-		res.send({
-			code: 1,
-			msg: 'type error'
-		});
-	}
-
-	return next();
-});
+applyApi(server);
 
 process.on('uncaughtException', (err) => {
 	logger.error(err);

src/logger.js

@@ -2,7 +2,7 @@
  * Created by rockyl on 2020-02-13.
  */
 
-import { configure, getLogger } from 'log4js';
+import {configure, getLogger} from 'log4js';
 import path from "path";
 import fs from "fs-extra";
 
@@ -12,11 +12,14 @@ fs.ensureDir(logPath);
 
 configure({
 	appenders: {
-		out: { type: 'console' },
-		allLog: { type: 'file', filename: path.join(logPath, 'log.log'), keepFileExt: true, maxLogSize: 10485760, backups: 3 },
+		out: {type: 'console'},
+		allLog: {
+			type: 'dateFile',
+			filename: path.join(logPath, 'log.log'),
+		},
 	},
 	categories: {
-		default: { appenders: ['out', 'allLog'], level: 'debug' },
+		default: {appenders: ['out', 'allLog'], level: 'debug'},
 	}
 
 });