Merge branch 'master' into gzip

fengmk2 · web-flow · commit fdec2e87853b · 2025-02-03T00:09:42.000+08:00
diff --git a/.autod.conf.js b/.autod.conf.js
diff --git a/.gitattributes b/.gitattributes
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
diff --git a/.github/workflows/nodejs.yml b/.github/workflows/nodejs.yml
@@ -0,0 +1,17 @@
+name: CI
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  Job:
+    name: Node.js
+    uses: node-modules/github-actions/.github/workflows/node-test.yml@master
+    with:
+      os: 'ubuntu-latest, windows-latest, macos-latest'
+      version: '14, 16, 18, 20, 22'
+    secrets:
+      CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -0,0 +1,12 @@
+name: Release
+on:
+  push:
+    branches: [ master ]
+
+jobs:
+  release:
+    name: Node.js
+    uses: eggjs/github-actions/.github/workflows/node-release.yml@master
+    secrets:
+      NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
+      GIT_TOKEN: ${{ secrets.GIT_TOKEN }}
diff --git a/.travis.yml b/.travis.yml
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,20 @@
+# Changelog
+
+## [3.2.0](https://github.com/eggjs/egg-logrotator/compare/v3.1.0...v3.2.0) (2024-09-28)
+
+
+### Features
+
+* remove debug deps ([#32](https://github.com/eggjs/egg-logrotator/issues/32)) ([e897d48](https://github.com/eggjs/egg-logrotator/commit/e897d483736d4d94c4a774c4454245a742c7050a))
+
+
+### Bug Fixes
+
+* hour crontab ([#31](https://github.com/eggjs/egg-logrotator/issues/31)) ([75e4787](https://github.com/eggjs/egg-logrotator/commit/75e478714f42e6d00f0500817bd2c6f1597174f2))
+
+
+---
+
 
 3.1.0 / 2019-04-25
 ==================
diff --git a/README.md b/README.md
@@ -1,22 +1,12 @@
 # egg-logrotator
 
 [![NPM version][npm-image]][npm-url]
-[![build status][travis-image]][travis-url]
-[![Test coverage][codecov-image]][codecov-url]
-[![David deps][david-image]][david-url]
-[![Known Vulnerabilities][snyk-image]][snyk-url]
+[![CI](https://github.com/eggjs/egg-logrotator/actions/workflows/nodejs.yml/badge.svg)](https://github.com/eggjs/egg-logrotator/actions/workflows/nodejs.yml)
+[![Test coverage](https://img.shields.io/codecov/c/github/eggjs/egg-logrotator.svg?style=flat-square)](https://codecov.io/gh/eggjs/egg-logrotator)
 [![npm download][download-image]][download-url]
 
 [npm-image]: https://img.shields.io/npm/v/egg-logrotator.svg?style=flat-square
 [npm-url]: https://npmjs.org/package/egg-logrotator
-[travis-image]: https://img.shields.io/travis/eggjs/egg-logrotator.svg?style=flat-square
-[travis-url]: https://travis-ci.org/eggjs/egg-logrotator
-[codecov-image]: https://img.shields.io/codecov/c/github/eggjs/egg-logrotator.svg?style=flat-square
-[codecov-url]: https://codecov.io/github/eggjs/egg-logrotator?branch=master
-[david-image]: https://img.shields.io/david/eggjs/egg-logrotator.svg?style=flat-square
-[david-url]: https://david-dm.org/eggjs/egg-logrotator
-[snyk-image]: https://snyk.io/test/npm/egg-logrotator/badge.svg?style=flat-square
-[snyk-url]: https://snyk.io/test/npm/egg-logrotator
 [download-image]: https://img.shields.io/npm/dm/egg-logrotator.svg?style=flat-square
 [download-url]: https://npmjs.org/package/egg-logrotator
 
@@ -122,3 +112,9 @@ Please open an issue [here](https://github.com/eggjs/egg/issues).
 ## License
 
 [MIT](https://github.com/eggjs/egg-logrotator/blob/master/LICENSE)
+
+## Contributors
+
+[![Contributors](https://contrib.rocks/image?repo=eggjs/egg-logrotator)](https://github.com/eggjs/egg-logrotator/graphs/contributors)
+
+Made with [contributors-img](https://contrib.rocks).
diff --git a/README.zh-CN.md b/README.zh-CN.md
@@ -1,22 +1,12 @@
 # egg-logrotator
 
 [![NPM version][npm-image]][npm-url]
-[![build status][travis-image]][travis-url]
-[![Test coverage][codecov-image]][codecov-url]
-[![David deps][david-image]][david-url]
-[![Known Vulnerabilities][snyk-image]][snyk-url]
+[![CI](https://github.com/eggjs/egg-logrotator/actions/workflows/nodejs.yml/badge.svg)](https://github.com/eggjs/egg-logrotator/actions/workflows/nodejs.yml)
+[![Test coverage](https://img.shields.io/codecov/c/github/eggjs/egg-logrotator.svg?style=flat-square)](https://codecov.io/gh/eggjs/egg-logrotator)
 [![npm download][download-image]][download-url]
 
 [npm-image]: https://img.shields.io/npm/v/egg-logrotator.svg?style=flat-square
 [npm-url]: https://npmjs.org/package/egg-logrotator
-[travis-image]: https://img.shields.io/travis/eggjs/egg-logrotator.svg?style=flat-square
-[travis-url]: https://travis-ci.org/eggjs/egg-logrotator
-[codecov-image]: https://img.shields.io/codecov/c/github/eggjs/egg-logrotator.svg?style=flat-square
-[codecov-url]: https://codecov.io/github/eggjs/egg-logrotator?branch=master
-[david-image]: https://img.shields.io/david/eggjs/egg-logrotator.svg?style=flat-square
-[david-url]: https://david-dm.org/eggjs/egg-logrotator
-[snyk-image]: https://snyk.io/test/npm/egg-logrotator/badge.svg?style=flat-square
-[snyk-url]: https://snyk.io/test/npm/egg-logrotator
 [download-image]: https://img.shields.io/npm/dm/egg-logrotator.svg?style=flat-square
 [download-url]: https://npmjs.org/package/egg-logrotator
 
@@ -115,3 +105,8 @@ Please open an issue [here](https://github.com/eggjs/egg/issues).
 
 [MIT](https://github.com/eggjs/egg-logrotator/blob/master/LICENSE)
 
+## Contributors
+
+[![Contributors](https://contrib.rocks/image?repo=eggjs/egg-logrotator)](https://github.com/eggjs/egg-logrotator/graphs/contributors)
+
+Made with [contributors-img](https://contrib.rocks).
diff --git a/app/lib/day_rotator.js b/app/lib/day_rotator.js
@@ -3,7 +3,7 @@
 const path = require('path');
 const moment = require('moment');
 const fs = require('mz/fs');
-const debug = require('debug')('egg-logrotator:day_rotator');
+const debug = require('util').debuglog('egg-logrotator:day_rotator');
 const Rotator = require('./rotator');
 const utils = require('../../utils');
 
diff --git a/app/lib/hour_rotator.js b/app/lib/hour_rotator.js
@@ -3,7 +3,7 @@
 const moment = require('moment');
 const fs = require('mz/fs');
 const path = require('path');
-const debug = require('debug')('egg-logrotator:hour_rotator');
+const debug = require('util').debuglog('egg-logrotator:hour_rotator');
 const Rotator = require('./rotator');
 
 
diff --git a/app/lib/rotator.js b/app/lib/rotator.js
@@ -5,8 +5,7 @@ const { createWriteStream, createReadStream } = require('fs');
 const fs = require('mz/fs');
 const { pipeline } = require('stream');
 const { createGzip } = require('zlib');
-const debug = require('debug')('egg-logrotator:rotator');
-
+const debug = require('util').debuglog('egg-logrotator:rotator');
 
 class Rotator {
 
diff --git a/app/lib/size_rotator.js b/app/lib/size_rotator.js
@@ -2,7 +2,7 @@
 
 const fs = require('mz/fs');
 const path = require('path');
-const debug = require('debug')('egg-logrotator:size_rotator');
+const debug = require('util').debuglog('egg-logrotator:size_rotator');
 const Rotator = require('./rotator');
 
 
diff --git a/app/schedule/rotate_by_hour.js b/app/schedule/rotate_by_hour.js
@@ -10,7 +10,7 @@ module.exports = app => {
 
     schedule: {
       type: 'worker', // only one worker run this task
-      cron: '0 * * * *', // run every hour at 00
+      cron: '1 * * * *', // run every hour at 01
       disable: (app.config.logrotator.filesRotateByHour || []).length === 0,
     },
 
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "egg-logrotator",
-  "version": "3.1.0",
+  "version": "3.2.0",
   "description": "logrotator for egg",
   "eggPlugin": {
     "name": "logrotator",
@@ -23,19 +23,16 @@
     "app.js"
   ],
   "dependencies": {
-    "debug": "^4.1.1",
     "moment": "^2.24.0",
     "mz": "^2.7.0"
   },
   "devDependencies": {
-    "autod": "^3.1.0",
     "egg": "^2.0.0",
     "egg-bin": "^4.13.0",
-    "egg-ci": "^1.11.0",
     "egg-logger": "^2.4.1",
     "egg-mock": "^3.22.2",
-    "eslint": "^5.16.0",
-    "eslint-config-egg": "^7.3.1",
+    "eslint": "8",
+    "eslint-config-egg": "12",
     "glob": "^7.1.3",
     "mz-modules": "^2.1.0",
     "pedding": "1"
@@ -45,23 +42,10 @@
   },
   "scripts": {
     "lint": "eslint .",
-    "pkgfiles": "egg-bin pkgfiles",
-    "test": "npm run lint -- --fix && npm run pkgfiles && npm run test-local",
+    "test": "npm run lint -- --fix && npm run test-local",
     "test-local": "egg-bin test",
     "cov": "egg-bin cov",
-    "ci": "npm run lint && npm run pkgfiles -- --check && npm run cov",
-    "autod": "autod"
-  },
-  "ci": {
-    "type": "travis",
-    "os": {
-      "travis": "linux, osx, windows"
-    },
-    "nyc": true,
-    "version": "8, 10",
-    "license": {
-      "year": 2016
-    }
+    "ci": "npm run lint && npm run cov"
   },
   "repository": {
     "type": "git",
