@eggjs/logrotator 5.0.0-beta.35 → 5.0.0-beta.36

package/dist/index.js

@@ -1,24 +1,27 @@
-import "./types.js";
-import { definePluginFactory } from 'egg';
+import { LogRotator } from "./lib/rotator.js";
+import { definePluginFactory } from "egg";
+
+//#region src/index.ts
 /**
- * LogRotator plugin
- *
- * @since 4.1.0
- * Usage:
- * ```ts
- * // config/plugin.ts
- * import logrotatorPlugin from '@eggjs/logrotator';
- *
- * export default {
- *   ...logrotatorPlugin(),
- * };
- * ```
- */
-export default definePluginFactory({
-    name: 'logrotator',
-    enable: true,
-    path: import.meta.dirname,
-    dependencies: ['schedule'],
+* LogRotator plugin
+*
+* @since 4.1.0
+* Usage:
+* ```ts
+* // config/plugin.ts
+* import logrotatorPlugin from '@eggjs/logrotator';
+*
+* export default {
+*   ...logrotatorPlugin(),
+* };
+* ```
+*/
+var src_default = definePluginFactory({
+	name: "logrotator",
+	enable: true,
+	path: import.meta.dirname,
+	dependencies: ["schedule"]
 });
-export * from "./lib/rotator.js";
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxZQUFZLENBQUM7QUFDcEIsT0FBTyxFQUFFLG1CQUFtQixFQUF5QixNQUFNLEtBQUssQ0FBQztBQUVqRTs7Ozs7Ozs7Ozs7OztHQWFHO0FBQ0gsZUFBZSxtQkFBbUIsQ0FBQztJQUNqQyxJQUFJLEVBQUUsWUFBWTtJQUNsQixNQUFNLEVBQUUsSUFBSTtJQUNaLElBQUksRUFBRSxNQUFNLENBQUMsSUFBSSxDQUFDLE9BQU87SUFDekIsWUFBWSxFQUFFLENBQUMsVUFBVSxDQUFDO0NBQzNCLENBQXFCLENBQUM7QUFFdkIsY0FBYyxrQkFBa0IsQ0FBQyJ9
+
+//#endregion
+export { LogRotator, src_default as default };

package/dist/lib/day_rotator.d.ts

@@ -1,8 +1,12 @@
-import { LogRotator, type RotateFile, type RotatorOptions } from './rotator.ts';
-export declare class DayRotator extends LogRotator {
-    private filesRotateBySize;
-    private filesRotateByHour;
-    constructor(options: RotatorOptions);
-    getRotateFiles(): Promise<Map<string, RotateFile>>;
-    _setFile(srcPath: string, files: Map<string, RotateFile>): void;
+import { LogRotator, RotateFile, RotatorOptions } from "./rotator.js";
+
+//#region src/lib/day_rotator.d.ts
+declare class DayRotator extends LogRotator {
+  private filesRotateBySize;
+  private filesRotateByHour;
+  constructor(options: RotatorOptions);
+  getRotateFiles(): Promise<Map<string, RotateFile>>;
+  _setFile(srcPath: string, files: Map<string, RotateFile>): void;
 }
+//#endregion
+export { DayRotator };

package/dist/lib/day_rotator.js

@@ -1,80 +1,64 @@
-import fs from 'node:fs/promises';
-import path from 'node:path';
-import { debuglog } from 'node:util';
-import moment from 'moment';
-import { exists } from 'utility';
 import { LogRotator } from "./rotator.js";
 import { walkLoggerFile } from "./utils.js";
-const debug = debuglog('egg/logrotator/lib/day_rotator');
-// rotate log by day
-// rename from foo.log to foo.log.YYYY-MM-DD
-export class DayRotator extends LogRotator {
-    filesRotateBySize;
-    filesRotateByHour;
-    constructor(options) {
-        super(options);
-        this.filesRotateBySize = this.app.config.logrotator.filesRotateBySize ?? [];
-        this.filesRotateByHour = this.app.config.logrotator.filesRotateByHour ?? [];
-    }
-    async getRotateFiles() {
-        const files = new Map();
-        const logDir = this.app.config.logger.dir;
-        const loggers = this.app.loggers;
-        const loggerFiles = walkLoggerFile(loggers);
-        for (let file of loggerFiles) {
-            // support relative path
-            if (!path.isAbsolute(file)) {
-                file = path.join(logDir, file);
-            }
-            this._setFile(file, files);
-        }
-        // Should rotate agent log, because schedule is running under app worker,
-        // agent log is the only difference between app worker and agent worker.
-        // - app worker -> egg-web.log
-        // - agent worker -> egg-agent.log
-        const agentLogName = this.app.config.logger.agentLogName;
-        this._setFile(path.join(logDir, agentLogName), files);
-        // rotateLogDirs is deprecated
-        // @ts-expect-error rotateLogDirs is not typed
-        const rotateLogDirs = this.app.config.logger.rotateLogDirs;
-        if (rotateLogDirs && rotateLogDirs.length > 0) {
-            this.app.deprecate('[@eggjs/logrotator] Do not use app.config.logger.rotateLogDirs, only rotate core loggers and custom loggers');
-            for (const dir of rotateLogDirs) {
-                const stat = await exists(dir);
-                if (!stat)
-                    continue;
-                try {
-                    const names = await fs.readdir(dir);
-                    for (const name of names) {
-                        if (!name.endsWith('.log')) {
-                            continue;
-                        }
-                        this._setFile(path.join(dir, name), files);
-                    }
-                }
-                catch (err) {
-                    this.logger.error(err);
-                }
-            }
-        }
-        return files;
-    }
-    _setFile(srcPath, files) {
-        // don't rotate logPath in filesRotateBySize
-        if (this.filesRotateBySize.includes(srcPath)) {
-            return;
-        }
-        // don't rotate logPath in filesRotateByHour
-        if (this.filesRotateByHour.includes(srcPath)) {
-            return;
-        }
-        if (!files.has(srcPath)) {
-            const ext = this.app.config.logrotator.gzip === true ? '.gz' : '';
-            // allow 2 minutes deviation
-            const targetPath = srcPath + moment().subtract(23, 'hours').subtract(58, 'minutes').format('.YYYY-MM-DD') + ext;
-            debug('set file %s => %s', srcPath, targetPath);
-            files.set(srcPath, { srcPath, targetPath });
-        }
-    }
-}
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZGF5X3JvdGF0b3IuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvbGliL2RheV9yb3RhdG9yLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxNQUFNLGtCQUFrQixDQUFDO0FBQ2xDLE9BQU8sSUFBSSxNQUFNLFdBQVcsQ0FBQztBQUM3QixPQUFPLEVBQUUsUUFBUSxFQUFFLE1BQU0sV0FBVyxDQUFDO0FBRXJDLE9BQU8sTUFBTSxNQUFNLFFBQVEsQ0FBQztBQUM1QixPQUFPLEVBQUUsTUFBTSxFQUFFLE1BQU0sU0FBUyxDQUFDO0FBRWpDLE9BQU8sRUFBRSxVQUFVLEVBQXdDLE1BQU0sY0FBYyxDQUFDO0FBQ2hGLE9BQU8sRUFBRSxjQUFjLEVBQUUsTUFBTSxZQUFZLENBQUM7QUFFNUMsTUFBTSxLQUFLLEdBQUcsUUFBUSxDQUFDLGdDQUFnQyxDQUFDLENBQUM7QUFFekQsb0JBQW9CO0FBQ3BCLDRDQUE0QztBQUM1QyxNQUFNLE9BQU8sVUFBVyxTQUFRLFVBQVU7SUFDaEMsaUJBQWlCLENBQVc7SUFDNUIsaUJBQWlCLENBQVc7SUFFcEMsWUFBWSxPQUF1QjtRQUNqQyxLQUFLLENBQUMsT0FBTyxDQUFDLENBQUM7UUFDZixJQUFJLENBQUMsaUJBQWlCLEdBQUcsSUFBSSxDQUFDLEdBQUcsQ0FBQyxNQUFNLENBQUMsVUFBVSxDQUFDLGlCQUFpQixJQUFJLEVBQUUsQ0FBQztRQUM1RSxJQUFJLENBQUMsaUJBQWlCLEdBQUcsSUFBSSxDQUFDLEdBQUcsQ0FBQyxNQUFNLENBQUMsVUFBVSxDQUFDLGlCQUFpQixJQUFJLEVBQUUsQ0FBQztJQUM5RSxDQUFDO0lBRUQsS0FBSyxDQUFDLGNBQWM7UUFDbEIsTUFBTSxLQUFLLEdBQUcsSUFBSSxHQUFHLEVBQXNCLENBQUM7UUFDNUMsTUFBTSxNQUFNLEdBQUcsSUFBSSxDQUFDLEdBQUcsQ0FBQyxNQUFNLENBQUMsTUFBTSxDQUFDLEdBQUcsQ0FBQztRQUMxQyxNQUFN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
+import fs from "node:fs/promises";
+import { debuglog } from "node:util";
+import { exists } from "utility";
+import path from "node:path";
+import moment from "moment";
+
+//#region src/lib/day_rotator.ts
+const debug = debuglog("egg/logrotator/lib/day_rotator");
+var DayRotator = class extends LogRotator {
+	filesRotateBySize;
+	filesRotateByHour;
+	constructor(options) {
+		super(options);
+		this.filesRotateBySize = this.app.config.logrotator.filesRotateBySize ?? [];
+		this.filesRotateByHour = this.app.config.logrotator.filesRotateByHour ?? [];
+	}
+	async getRotateFiles() {
+		const files = /* @__PURE__ */ new Map();
+		const logDir = this.app.config.logger.dir;
+		const loggers = this.app.loggers;
+		const loggerFiles = walkLoggerFile(loggers);
+		for (let file of loggerFiles) {
+			if (!path.isAbsolute(file)) file = path.join(logDir, file);
+			this._setFile(file, files);
+		}
+		const agentLogName = this.app.config.logger.agentLogName;
+		this._setFile(path.join(logDir, agentLogName), files);
+		const rotateLogDirs = this.app.config.logger.rotateLogDirs;
+		if (rotateLogDirs && rotateLogDirs.length > 0) {
+			this.app.deprecate("[@eggjs/logrotator] Do not use app.config.logger.rotateLogDirs, only rotate core loggers and custom loggers");
+			for (const dir of rotateLogDirs) {
+				if (!await exists(dir)) continue;
+				try {
+					const names = await fs.readdir(dir);
+					for (const name of names) {
+						if (!name.endsWith(".log")) continue;
+						this._setFile(path.join(dir, name), files);
+					}
+				} catch (err) {
+					this.logger.error(err);
+				}
+			}
+		}
+		return files;
+	}
+	_setFile(srcPath, files) {
+		if (this.filesRotateBySize.includes(srcPath)) return;
+		if (this.filesRotateByHour.includes(srcPath)) return;
+		if (!files.has(srcPath)) {
+			const ext = this.app.config.logrotator.gzip === true ? ".gz" : "";
+			const targetPath = srcPath + moment().subtract(23, "hours").subtract(58, "minutes").format(".YYYY-MM-DD") + ext;
+			debug("set file %s => %s", srcPath, targetPath);
+			files.set(srcPath, {
+				srcPath,
+				targetPath
+			});
+		}
+	}
+};
+
+//#endregion
+export { DayRotator };

package/dist/lib/hour_rotator.d.ts

@@ -1,6 +1,10 @@
-import { LogRotator, type RotateFile } from './rotator.ts';
-export declare class HourRotator extends LogRotator {
-    getRotateFiles(): Promise<Map<string, RotateFile>>;
-    get hourDelimiter(): string;
-    _setFile(srcPath: string, files: Map<string, RotateFile>): void;
+import { LogRotator, RotateFile } from "./rotator.js";
+
+//#region src/lib/hour_rotator.d.ts
+declare class HourRotator extends LogRotator {
+  getRotateFiles(): Promise<Map<string, RotateFile>>;
+  get hourDelimiter(): string;
+  _setFile(srcPath: string, files: Map<string, RotateFile>): void;
 }
+//#endregion
+export { HourRotator };

package/dist/lib/hour_rotator.js

@@ -1,39 +1,38 @@
-import path from 'node:path';
-import { debuglog } from 'node:util';
-import moment from 'moment';
-import { exists } from 'utility';
 import { LogRotator } from "./rotator.js";
-const debug = debuglog('egg/logrotator/lib/hour_rotator');
-// rotate log by hour
-// rename from foo.log to foo.log.YYYY-MM-DD-HH
-export class HourRotator extends LogRotator {
-    async getRotateFiles() {
-        const files = new Map();
-        const logDir = this.app.config.logger.dir;
-        const filesRotateByHour = this.app.config.logrotator.filesRotateByHour ?? [];
-        for (let logPath of filesRotateByHour) {
-            // support relative path
-            if (!path.isAbsolute(logPath)) {
-                logPath = path.join(logDir, logPath);
-            }
-            const stat = await exists(logPath);
-            if (!stat) {
-                continue;
-            }
-            this._setFile(logPath, files);
-        }
-        return files;
-    }
-    get hourDelimiter() {
-        return this.app.config.logrotator.hourDelimiter;
-    }
-    _setFile(srcPath, files) {
-        if (!files.has(srcPath)) {
-            const ext = this.app.config.logrotator.gzip === true ? '.gz' : '';
-            const targetPath = srcPath + moment().subtract(1, 'hours').format(`.YYYY-MM-DD${this.hourDelimiter}HH`) + ext;
-            debug('set file %s => %s', srcPath, targetPath);
-            files.set(srcPath, { srcPath, targetPath });
-        }
-    }
-}
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaG91cl9yb3RhdG9yLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2xpYi9ob3VyX3JvdGF0b3IudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxJQUFJLE1BQU0sV0FBVyxDQUFDO0FBQzdCLE9BQU8sRUFBRSxRQUFRLEVBQUUsTUFBTSxXQUFXLENBQUM7QUFFckMsT0FBTyxNQUFNLE1BQU0sUUFBUSxDQUFDO0FBQzVCLE9BQU8sRUFBRSxNQUFNLEVBQUUsTUFBTSxTQUFTLENBQUM7QUFFakMsT0FBTyxFQUFFLFVBQVUsRUFBbUIsTUFBTSxjQUFjLENBQUM7QUFFM0QsTUFBTSxLQUFLLEdBQUcsUUFBUSxDQUFDLGlDQUFpQyxDQUFDLENBQUM7QUFFMUQscUJBQXFCO0FBQ3JCLCtDQUErQztBQUMvQyxNQUFNLE9BQU8sV0FBWSxTQUFRLFVBQVU7SUFDekMsS0FBSyxDQUFDLGNBQWM7UUFDbEIsTUFBTSxLQUFLLEdBQUcsSUFBSSxHQUFHLEVBQXNCLENBQUM7UUFDNUMsTUFBTSxNQUFNLEdBQUcsSUFBSSxDQUFDLEdBQUcsQ0FBQyxNQUFNLENBQUMsTUFBTSxDQUFDLEdBQUcsQ0FBQztRQUMxQyxNQUFNLGlCQUFpQixHQUFHLElBQUksQ0FBQyxHQUFHLENBQUMsTUFBTSxDQUFDLFVBQVUsQ0FBQyxpQkFBaUIsSUFBSSxFQUFFLENBQUM7UUFFN0UsS0FBSyxJQUFJLE9BQU8sSUFBSSxpQkFBaUIsRUFBRSxDQUFDO1lBQ3RDLHdCQUF3QjtZQUN4QixJQUFJLENBQUMsSUFBSSxDQUFDLFVBQVUsQ0FBQyxPQUFPLENBQUMsRUFBRSxDQUFDO2dCQUM5QixPQUFPLEdBQUcsSUFBSSxDQUFDLElBQUksQ0FBQyxNQUFNLEVBQUUsT0FBTyxDQUFDLENBQUM7WUFDdkMsQ0FBQztZQUNELE1BQU0sSUFBSSxHQUFHLE1BQU0sTUFBTSxDQUFDLE9BQU8sQ0FBQyxDQUFDO1lBQ25DLElBQUksQ0FBQyxJQUFJLEVBQUUsQ0FBQztnQkFDVixTQUFTO1lBQ1gsQ0FBQztZQUNELElBQUksQ0FBQyxRQUFRLENBQUMsT0FBTyxFQUFFLEtBQUssQ0FBQyxDQUFDO1FBQ2hDLENBQUM7UUFFRCxPQUFPLEtBQUssQ0FBQztJQUNmLENBQUM7SUFFRCxJQUFJLGFBQWE7UUFDZixPQUFPLElBQUksQ0FBQyxHQUFHLENBQUMsTUFBTSxDQUFDLFVBQVUsQ0FBQyxhQUFhLENBQUM7SUFDbEQsQ0FBQztJQUVELFFBQVEsQ0FBQyxPQUFlLEVBQUUsS0FBOEI7UUFDdEQsSUFBSSxDQUFDLEtBQUssQ0FBQyxHQUFHLENBQUMsT0FBTyxDQUFDLEVBQUUsQ0FBQztZQUN4QixNQUFNLEdBQUcsR0FBRyxJQUFJLENBQUMsR0FBRyxDQUFDLE1BQU0sQ0FBQyxVQUFVLENBQUMsSUFBSSxLQUFLLElBQUksQ0FBQyxDQUFDLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQUM7WUFDbEUsTUFBTSxVQUFVLEdBQUcsT0FBTyxHQUFHLE1BQU0sRUFBRSxDQUFDLFFBQVEsQ0FBQyxDQUFDLEVBQUUsT0FBTyxDQUFDLENBQUMsTUFBTSxDQUFDLGNBQWMsSUFBSSxDQUFDLGFBQWEsSUFBSSxDQUFDLEdBQUcsR0FBRyxDQUFDO1lBQzlHLEtBQUssQ0FBQyxtQkFBbUIsRUFBRSxPQUFPLEVBQUUsVUFBVSxDQUFDLENBQUM7WUFDaEQsS0FBSyxDQUFDLEdBQUcsQ0FBQyxPQUFPLEVBQUUsRUFBRSxPQUFPLEVBQUUsVUFBVSxFQUFFLENBQUMsQ0FBQztRQUM5QyxDQUFDO0lBQ0gsQ0FBQztDQUNGIn0=
+import { debuglog } from "node:util";
+import { exists } from "utility";
+import path from "node:path";
+import moment from "moment";
+
+//#region src/lib/hour_rotator.ts
+const debug = debuglog("egg/logrotator/lib/hour_rotator");
+var HourRotator = class extends LogRotator {
+	async getRotateFiles() {
+		const files = /* @__PURE__ */ new Map();
+		const logDir = this.app.config.logger.dir;
+		const filesRotateByHour = this.app.config.logrotator.filesRotateByHour ?? [];
+		for (let logPath of filesRotateByHour) {
+			if (!path.isAbsolute(logPath)) logPath = path.join(logDir, logPath);
+			if (!await exists(logPath)) continue;
+			this._setFile(logPath, files);
+		}
+		return files;
+	}
+	get hourDelimiter() {
+		return this.app.config.logrotator.hourDelimiter;
+	}
+	_setFile(srcPath, files) {
+		if (!files.has(srcPath)) {
+			const ext = this.app.config.logrotator.gzip === true ? ".gz" : "";
+			const targetPath = srcPath + moment().subtract(1, "hours").format(`.YYYY-MM-DD${this.hourDelimiter}HH`) + ext;
+			debug("set file %s => %s", srcPath, targetPath);
+			files.set(srcPath, {
+				srcPath,
+				targetPath
+			});
+		}
+	}
+};
+
+//#endregion
+export { HourRotator };

package/dist/lib/rotator.d.ts

@@ -1,16 +1,20 @@
-import type { Application } from 'egg';
-export interface RotatorOptions {
-    app: Application;
+import { Application } from "egg";
+
+//#region src/lib/rotator.d.ts
+interface RotatorOptions {
+  app: Application;
 }
-export interface RotateFile {
-    srcPath: string;
-    targetPath: string;
+interface RotateFile {
+  srcPath: string;
+  targetPath: string;
 }
-export declare abstract class LogRotator {
-    protected readonly options: RotatorOptions;
-    protected readonly app: Application;
-    protected readonly logger: Application['coreLogger'];
-    constructor(options: RotatorOptions);
-    abstract getRotateFiles(): Promise<Map<string, RotateFile>>;
-    rotate(): Promise<void>;
+declare abstract class LogRotator {
+  protected readonly options: RotatorOptions;
+  protected readonly app: Application;
+  protected readonly logger: Application["coreLogger"];
+  constructor(options: RotatorOptions);
+  abstract getRotateFiles(): Promise<Map<string, RotateFile>>;
+  rotate(): Promise<void>;
 }
+//#endregion
+export { LogRotator, RotateFile, RotatorOptions };

package/dist/lib/rotator.js

@@ -1,73 +1,56 @@
-import assert from 'node:assert';
-import { createWriteStream, createReadStream } from 'node:fs';
-import fs from 'node:fs/promises';
-import { pipeline } from 'node:stream/promises';
-import { debuglog } from 'node:util';
-import { createGzip } from 'node:zlib';
-import { exists } from 'utility';
-const debug = debuglog('egg/logrotator/lib/rotator');
-export class LogRotator {
-    options;
-    app;
-    logger;
-    constructor(options) {
-        this.options = options;
-        assert(this.options.app, 'options.app is required');
-        this.app = this.options.app;
-        this.logger = this.app.coreLogger;
-    }
-    async rotate() {
-        const files = await this.getRotateFiles();
-        assert(files instanceof Map, 'getRotateFiles should return a Map');
-        const rotatedFiles = [];
-        for (const file of files.values()) {
-            try {
-                debug('rename from %s to %s', file.srcPath, file.targetPath);
-                await renameOrDelete(file.srcPath, file.targetPath, this.app.config.logrotator.gzip);
-                rotatedFiles.push(`${file.srcPath} -> ${file.targetPath}`);
-            }
-            catch (e) {
-                const err = e;
-                err.message = `[@eggjs/logrotator] rename ${file.srcPath}, found exception: ${err.message}`;
-                this.logger.error(err);
-            }
-        }
-        if (rotatedFiles.length > 0) {
-            // tell every one to reload logger
-            debug('broadcast log-reload, rotated files: %j', rotatedFiles);
-            this.logger.info('[@eggjs/logrotator] broadcast log-reload');
-            this.app.messenger.sendToApp('log-reload');
-            this.app.messenger.sendToAgent('log-reload');
-        }
-        this.logger.info('[@eggjs/logrotator] rotate files success by %s, files %j', this.constructor.name, rotatedFiles);
-    }
-}
-// rename from srcPath to targetPath, for example foo.log.1 > foo.log.2
-// if gzip is true, then use gzip to compress the file, and delete the src file, for example foo.log.1 -> foo.log.2.gz
+import assert from "node:assert";
+import { createReadStream, createWriteStream } from "node:fs";
+import fs from "node:fs/promises";
+import { pipeline } from "node:stream/promises";
+import { debuglog } from "node:util";
+import { createGzip } from "node:zlib";
+import { exists } from "utility";
+
+//#region src/lib/rotator.ts
+const debug = debuglog("egg/logrotator/lib/rotator");
+var LogRotator = class {
+	options;
+	app;
+	logger;
+	constructor(options) {
+		this.options = options;
+		assert(this.options.app, "options.app is required");
+		this.app = this.options.app;
+		this.logger = this.app.coreLogger;
+	}
+	async rotate() {
+		const files = await this.getRotateFiles();
+		assert(files instanceof Map, "getRotateFiles should return a Map");
+		const rotatedFiles = [];
+		for (const file of files.values()) try {
+			debug("rename from %s to %s", file.srcPath, file.targetPath);
+			await renameOrDelete(file.srcPath, file.targetPath, this.app.config.logrotator.gzip);
+			rotatedFiles.push(`${file.srcPath} -> ${file.targetPath}`);
+		} catch (e) {
+			const err = e;
+			err.message = `[@eggjs/logrotator] rename ${file.srcPath}, found exception: ${err.message}`;
+			this.logger.error(err);
+		}
+		if (rotatedFiles.length > 0) {
+			debug("broadcast log-reload, rotated files: %j", rotatedFiles);
+			this.logger.info("[@eggjs/logrotator] broadcast log-reload");
+			this.app.messenger.sendToApp("log-reload");
+			this.app.messenger.sendToAgent("log-reload");
+		}
+		this.logger.info("[@eggjs/logrotator] rotate files success by %s, files %j", this.constructor.name, rotatedFiles);
+	}
+};
 async function renameOrDelete(srcPath, targetPath, gzip) {
-    if (srcPath === targetPath) {
-        return;
-    }
-    const srcExists = await exists(srcPath);
-    if (!srcExists) {
-        return;
-    }
-    const targetExists = await exists(targetPath);
-    // if target file exists, then throw
-    // because the target file always be renamed first.
-    if (targetExists) {
-        const err = new Error(`targetFile ${targetPath} exists!!!`);
-        throw err;
-    }
-    // if gzip is true, then use gzip
-    if (gzip === true) {
-        const tmpPath = `${targetPath}.tmp`;
-        await fs.rename(srcPath, tmpPath);
-        await pipeline(createReadStream(tmpPath), createGzip(), createWriteStream(targetPath));
-        await fs.unlink(tmpPath);
-    }
-    else {
-        await fs.rename(srcPath, targetPath);
-    }
+	if (srcPath === targetPath) return;
+	if (!await exists(srcPath)) return;
+	if (await exists(targetPath)) throw /* @__PURE__ */ new Error(`targetFile ${targetPath} exists!!!`);
+	if (gzip === true) {
+		const tmpPath = `${targetPath}.tmp`;
+		await fs.rename(srcPath, tmpPath);
+		await pipeline(createReadStream(tmpPath), createGzip(), createWriteStream(targetPath));
+		await fs.unlink(tmpPath);
+	} else await fs.rename(srcPath, targetPath);
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicm90YXRvci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9saWIvcm90YXRvci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLE1BQU0sTUFBTSxhQUFhLENBQUM7QUFDakMsT0FBTyxFQUFFLGlCQUFpQixFQUFFLGdCQUFnQixFQUFFLE1BQU0sU0FBUyxDQUFDO0FBQzlELE9BQU8sRUFBRSxNQUFNLGtCQUFrQixDQUFDO0FBQ2xDLE9BQU8sRUFBRSxRQUFRLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQUNoRCxPQUFPLEVBQUUsUUFBUSxFQUFFLE1BQU0sV0FBVyxDQUFDO0FBQ3JDLE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSxXQUFXLENBQUM7QUFHdkMsT0FBTyxFQUFFLE1BQU0sRUFBRSxNQUFNLFNBQVMsQ0FBQztBQUVqQyxNQUFNLEtBQUssR0FBRyxRQUFRLENBQUMsNEJBQTRCLENBQUMsQ0FBQztBQVdyRCxNQUFNLE9BQWdCLFVBQVU7SUFDWCxPQUFPLENBQWlCO0lBQ3hCLEdBQUcsQ0FBYztJQUNqQixNQUFNLENBQTRCO0lBRXJELFlBQVksT0FBdUI7UUFDakMsSUFBSSxDQUFDLE9BQU8sR0FBRyxPQUFPLENBQUM7UUFDdkIsTUFBTSxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUMsR0FBRyxFQUFFLHlCQUF5QixDQUFDLENBQUM7UUFDcEQsSUFBSSxDQUFDLEdBQUcsR0FBRyxJQUFJLENBQUMsT0FBTyxDQUFDLEdBQUcsQ0FBQztRQUM1QixJQUFJLENBQUMsTUFBTSxHQUFHLElBQUksQ0FBQyxHQUFHLENBQUMsVUFBVSxDQUFDO0lBQ3BDLENBQUM7SUFJRCxLQUFLLENBQUMsTUFBTTtRQUNWLE1BQU0sS0FBSyxHQUFHLE1BQU0sSUFBSSxDQUFDLGNBQWMsRUFBRSxDQUFDO1FBQzFDLE1BQU0sQ0FBQyxLQUFLLFlBQVksR0FBRyxFQUFFLG9DQUFvQyxDQUFDLENBQUM7UUFDbkUsTUFBTSxZQUFZLEdBQWEsRUFB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
+
+//#endregion
+export { LogRotator };

package/dist/lib/size_rotator.d.ts

@@ -1,5 +1,9 @@
-import { LogRotator, type RotateFile } from './rotator.ts';
-export declare class SizeRotator extends LogRotator {
-    getRotateFiles(): Promise<Map<string, RotateFile>>;
-    _setFile(logPath: string, files: Map<string, RotateFile>): void;
+import { LogRotator, RotateFile } from "./rotator.js";
+
+//#region src/lib/size_rotator.d.ts
+declare class SizeRotator extends LogRotator {
+  getRotateFiles(): Promise<Map<string, RotateFile>>;
+  _setFile(logPath: string, files: Map<string, RotateFile>): void;
 }
+//#endregion
+export { SizeRotator };