Skip to content

Commit 7651c46

Browse files
committed
Shorter mail subject #8635
1 parent 4fa9ad1 commit 7651c46

2 files changed

Lines changed: 10 additions & 16 deletions

File tree

src/Model/Traits/Log.php

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ trait Log
1515
use HasUrl;
1616

1717
#[ORM\Column(type: 'smallint')]
18-
private int $priority;
18+
private int $level;
1919

2020
#[ORM\Column(type: 'string', length: 5000)]
2121
private string $message = '';
@@ -36,20 +36,14 @@ trait Log
3636
#[API\Exclude]
3737
private array $context = [];
3838

39-
/**
40-
* Set priority.
41-
*/
42-
public function setPriority(int $priority): void
39+
public function setLevel(int $level): void
4340
{
44-
$this->priority = $priority;
41+
$this->level = $level;
4542
}
4643

47-
/**
48-
* Get priority.
49-
*/
50-
public function getPriority(): int
44+
public function getLevel(): int
5145
{
52-
return $this->priority;
46+
return $this->level;
5347
}
5448

5549
/**

src/Repository/Traits/LogRepository.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
use Doctrine\ORM\EntityManager;
1010
use Doctrine\ORM\QueryBuilder;
1111
use Ecodev\Felix\Repository\LogRepository as LogRepositoryInterface;
12+
use Monolog\Level;
1213
use Monolog\LogRecord;
13-
use Psr\Log\LogLevel;
1414

1515
trait LogRepository
1616
{
@@ -78,8 +78,8 @@ private function failedOften(string $success, string $failed, int $maxFailureCou
7878
$select = $this->getEntityManager()->getConnection()->createQueryBuilder()
7979
->select('message')
8080
->from('log')
81-
->andWhere('priority = :priority')
82-
->setParameter('priority', LogLevel::INFO)
81+
->andWhere('level = :level')
82+
->setParameter('level', Level::Info->value)
8383
->andWhere('message IN (:message)')
8484
->setParameter('message', [$success, $failed], ArrayParameterType::STRING)
8585
->andWhere('creation_date > DATE_SUB(NOW(), INTERVAL 30 MINUTE)')
@@ -112,8 +112,8 @@ public function deleteOldLogs(): int
112112
$connection = $this->getEntityManager()->getConnection();
113113
$query = $connection->createQueryBuilder()
114114
->delete('log')
115-
->andWhere('log.priority != :priority OR message IN (:message)')
116-
->setParameter('priority', LogLevel::INFO)
115+
->andWhere('log.level != :level OR message IN (:message)')
116+
->setParameter('level', Level::Info->value)
117117
->setParameter('message', [
118118
LogRepositoryInterface::LOGIN,
119119
LogRepositoryInterface::LOGIN_FAILED,

0 commit comments

Comments
 (0)