Skip to content

Commit 55e95fd

Browse files
committed
refactor: revert custom datetime changes
1 parent 7f1451e commit 55e95fd

File tree

2 files changed

+6
-21
lines changed

2 files changed

+6
-21
lines changed

packages/log/src/FileHandlers/RotatingFileHandler.php

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
use DateTimeImmutable;
88
use InvalidArgumentException;
99
use Monolog\Handler\RotatingFileHandler as MonoRotatingFileHandler;
10-
use Tempest\DateTime\DateTime;
1110

1211
final class RotatingFileHandler extends MonoRotatingFileHandler
1312
{
@@ -29,13 +28,11 @@ protected function setDateFormat(string $dateFormat): void
2928

3029
protected function getNextRotation(): DateTimeImmutable
3130
{
32-
$datetime = match (str_replace(['/', '_', '.'], '-', $this->dateFormat)) {
33-
self::FILE_PER_WEEK => DateTime::now()->startOfWeek()->plusDays(7),
34-
self::FILE_PER_MONTH => DateTime::now()->startOfMonth()->plusMonth(),
35-
self::FILE_PER_YEAR => DateTime::now()->startOfYear()->plusYear(),
36-
default => DateTime::now()->plusDay()->startOfDay(),
31+
return match (str_replace(['/', '_', '.'], '-', $this->dateFormat)) {
32+
self::FILE_PER_WEEK => new DateTimeImmutable('first day of next week')->setTime(0, 0, 0),
33+
self::FILE_PER_MONTH => new DateTimeImmutable('first day of next month')->setTime(0, 0, 0),
34+
self::FILE_PER_YEAR => new DateTimeImmutable('first day of January next year')->setTime(0, 0, 0),
35+
default => new DateTimeImmutable('tomorrow')->setTime(0, 0, 0),
3736
};
38-
39-
return $datetime->toNativeDateTime();
4037
}
4138
}

packages/log/src/GenericLogger.php

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -87,22 +87,10 @@ public function log(mixed $level, Stringable|string $message, array $context = [
8787
private function writeLog(MonologLogLevel $level, string $message, array $context): void
8888
{
8989
foreach ($this->logConfig->channels as $channel) {
90-
$this->resolveDriver($channel, $level)->addRecord(
91-
level: $level,
92-
message: $message,
93-
context: $context,
94-
datetime: $this->resolveCurrentDateTime(),
95-
);
90+
$this->resolveDriver($channel, $level)->log($level, $message, $context);
9691
}
9792
}
9893

99-
private function resolveCurrentDateTime(): JsonSerializableDateTimeImmutable
100-
{
101-
return new JsonSerializableDateTimeImmutable(useMicroseconds: true)->setTimestamp(
102-
timestamp: DateTime::now()->getTimestamp()->getSeconds(),
103-
);
104-
}
105-
10694
private function resolveDriver(LogChannel $channel, MonologLogLevel $level): Monolog
10795
{
10896
$key = spl_object_id($channel) . $level->value;

0 commit comments

Comments
 (0)