Merge branch '5.x' into 6.x

# Conflicts:
#	CHANGELOG.md

CHANGELOG.md

@@ -3,6 +3,7 @@
 ## Unreleased
 
 - Fixed an error that would occur when running a feed with the backup database setting enabled, when Craft's `backupCommand` was set to false. ([#1461](https://github.com/craftcms/feed-me/pull/1461))
+- Logs now use the default log component, and are stored in the database. [#1344](https://github.com/craftcms/feed-me/issues/1344)
 
 ## 6.1.0 - 2024-05-26
 

README.md

@@ -31,6 +31,33 @@ composer require craftcms/feed-me
 ./craft plugin/install feed-me
 ```
 
+## Customizing Logs
+
+As of version `5.6`/`6.2`, logging is handled by Craft's log component and stored in the database instead of the filesystem.
+If you want them logged to files (or anywhere else), you can add your own log target in your `config/app.php` file:
+
+```php
+return [
+    'components' => [
+        'log' => [
+            'monologTargetConfig' => [
+                // optionally, omit from Craft's default logs
+                'except' => ['feed-me'],
+            ],
+
+            // add your own log target to write logs to file
+            'targets' => [
+                [
+                    'class' => \yii\log\FileTarget::class,
+                    'logFile' => '@storage/logs/feed-me.log',
+                    'categories' => ['feed-me'],
+                ],
+            ],
+        ],
+    ],
+];
+```
+
 ## Resources
 
 - **[Feed Me Plugin Page](https://plugins.craftcms.com/feed-me)** – The official plugin page for Feed Me

src/migrations/Install.php

@@ -52,10 +52,24 @@ protected function createTables(): void
             'dateUpdated' => $this->dateTime()->notNull(),
             'uid' => $this->uid(),
         ]);
+
+        // @see \craft\feedme\migrations\m240611_134740_create_logs_table
+        $this->createTable('{{%feedme_logs}}', [
+            'id' => $this->bigPrimaryKey(),
+            'level' => $this->integer(),
+            'category' => $this->string(),
+            'log_time' => $this->double(),
+            'prefix' => $this->text(),
+            'message' => $this->text(),
+        ]);
+
+        $this->createIndex('idx_log_level', '{{%feedme_logs}}', 'level');
+        $this->createIndex('idx_log_category', '{{%feedme_logs}}', 'category');
     }
 
     protected function removeTables(): void
     {
         $this->dropTableIfExists('{{%feedme_feeds}}');
+        $this->dropTableIfExists('{{%feedme_logs}}');
     }
 }

src/migrations/m240611_134740_create_logs_table.php

@@ -0,0 +1,42 @@
+<?php
+
+namespace craft\feedme\migrations;
+
+use craft\db\Migration;
+
+/**
+ * m240611_134740_create_logs_table migration.
+ */
+class m240611_134740_create_logs_table extends Migration
+{
+    /**
+     * @inheritdoc
+     */
+    public function safeUp(): bool
+    {
+        // @see \craft\feedme\migrations\m240611_134740_create_logs_table
+        $this->createTable('{{%feedme_logs}}', [
+            'id' => $this->bigPrimaryKey(),
+            'level' => $this->integer(),
+            'category' => $this->string(),
+            'log_time' => $this->double(),
+            'prefix' => $this->text(),
+            'message' => $this->text(),
+        ]);
+
+        $this->createIndex('idx_log_level', '{{%feedme_logs}}', 'level');
+        $this->createIndex('idx_log_category', '{{%feedme_logs}}', 'category');
+
+        return true;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function safeDown(): bool
+    {
+        $this->dropTableIfExists('{{%feedme_logs}}');
+
+        return true;
+    }
+}