@webtypen/webframez-core 0.3.50 → 0.3.52

package/dist/Backup/BackupManager.js

@@ -209,6 +209,7 @@ class BackupManager {
                 options: source.options || {},
                 backupKey: context.backupKey,
                 backupId: context.backupId,
+                log: context.log,
             });
             return {
                 connection: source.connection,
@@ -304,7 +305,11 @@ class BackupManager {
                 this.log(options, "File copy finished");
                 for (const source of normalizeArray(backupType.databases)) {
                     this.log(options, `Backing up database '${source.connection || "default"}'`);
-                    result.databases.push(yield this.backupDatabase(source, contentDir, { backupKey: key, backupId: id }));
+                    result.databases.push(yield this.backupDatabase(source, contentDir, {
+                        backupKey: key,
+                        backupId: id,
+                        log: (message, payload) => this.log(options, message, payload),
+                    }));
                     this.log(options, `Database '${source.connection || "default"}' backup finished`);
                 }
                 result.artifact = this.buildArtifact(key, backupType, workRunDir, contentDir, now, id, options);

package/dist/Commands/QueueWorkerCommand.d.ts

@@ -15,6 +15,9 @@ export declare class QueueWorkerCommand extends ConsoleCommand {
     jobsFailed: number;
     lastJob: any;
     log(message: string): void;
+    private formatAutomationCommand;
+    private formatAutomationExecution;
+    private logRegisteredAutomation;
     handle(): Promise<void>;
     init(): boolean;
     canStart(): boolean;

package/dist/Commands/QueueWorkerCommand.js

@@ -49,6 +49,47 @@ class QueueWorkerCommand extends ConsoleCommand_1.ConsoleCommand {
             .tz(this.workerConfig.timezone ? this.workerConfig.timezone : "Europe/Berlin")
             .format("YY-MM-DD HH:mm:ss")}] ${message}`);
     }
+    formatAutomationCommand(automation) {
+        if (automation.jobclass === "BackupRunJob" && automation.payload && automation.payload.backupKey) {
+            return `backup:run ${automation.payload.backupKey}`;
+        }
+        return automation.jobclass || "unknown";
+    }
+    formatAutomationExecution(execution) {
+        if (!Array.isArray(execution)) {
+            return "invalid execution";
+        }
+        const [type, value, options] = execution;
+        const suffix = options && options.identifier ? ` (${options.identifier})` : "";
+        if (type === "daily") {
+            return `daily at ${value}${suffix}`;
+        }
+        if (type === "every_hour") {
+            return `every hour at minute ${value !== undefined && value !== null ? value : 0}${suffix}`;
+        }
+        if (type === "every_x_mins") {
+            return `every ${value} minute(s)${suffix}`;
+        }
+        if (value !== undefined && value !== null) {
+            return `${type} at ${value}${suffix}`;
+        }
+        return `${type}${suffix}`;
+    }
+    logRegisteredAutomation() {
+        const automations = this.getWorkerAutomation();
+        if (!automations || automations.length < 1) {
+            this.log("Registered automations: none");
+            return;
+        }
+        this.log("Registered automations:");
+        for (const automation of automations) {
+            const command = this.formatAutomationCommand(automation);
+            const executions = automation.executions && Array.isArray(automation.executions) && automation.executions.length > 0
+                ? automation.executions.map((execution) => this.formatAutomationExecution(execution)).join(", ")
+                : "no executions";
+            this.log(`- ${command}: ${executions}`);
+        }
+    }
     handle() {
         return __awaiter(this, void 0, void 0, function* () {
             const workerKey = this.getOption("worker");
@@ -80,6 +121,7 @@ class QueueWorkerCommand extends ConsoleCommand_1.ConsoleCommand {
             });
             try {
                 this.log("Queue started");
+                this.logRegisteredAutomation();
                 yield this.run();
             }
             catch (e) {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@webtypen/webframez-core",
-    "version": "0.3.50",
+    "version": "0.3.52",
     "description": "The core package of the typescript based webframez (web-framework) by webtypen.de",
     "homepage": "https://webtypen.de/",
     "license": "MIT",