Skip to content

Commit 911b515

Browse files
authored
Merge pull request #14 from bilfeldt/fix/duration
Rename field 'time' to 'duration'
2 parents df127bb + 5890e14 commit 911b515

File tree

6 files changed

+11
-10
lines changed

6 files changed

+11
-10
lines changed

database/factories/RequestLogFactory.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ public function definition()
2424
'payload' => $this->getPayload(),
2525
'response_headers' => $this->getHeaders(),
2626
'response_body' => $this->faker->sentence(),
27-
'time' => $this->faker->numberBetween(100, 30000),
27+
'duration' => $this->faker->numberBetween(100, 30000),
2828
'memory' => $this->faker->randomFloat(1, 1, 100),
2929
];
3030
}

database/migrations/create_request_logs_table.php.stub

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ return new class extends Migration
2424
$table->json('payload')->nullable();
2525
$table->json('response_headers')->nullable();
2626
$table->json('response_body')->nullable();
27-
$table->unsignedMediumInteger('time')->nullable(); // ms
27+
$table->unsignedMediumInteger('duration')->nullable(); // ms
2828
$table->float('memory')->nullable(); // MB
2929
$table->timestamps();
3030

src/Contracts/RequestLoggerInterface.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@ interface RequestLoggerInterface
99
/**
1010
* @param Request $request
1111
* @param \Illuminate\Http\Response|\Illuminate\Http\JsonResponse|\Illuminate\Http\RedirectResponse|\Symfony\Component\HttpFoundation\Response $response
12-
* @param int|null $time
12+
* @param int|null $duration
1313
* @param int|null $memory
1414
*/
1515
public function log(
1616
Request $request,
1717
$response,
18-
?int $time = null,
18+
?int $duration = null,
1919
?int $memory = null
2020
): void;
2121
}

src/Listeners/LogRequest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ class LogRequest
1919
public function handle(RequestHandled $event)
2020
{
2121
$startTime = defined('LARAVEL_START') ? LARAVEL_START : $event->request->server('REQUEST_TIME_FLOAT');
22-
$time = $startTime ? floor((microtime(true) - $startTime) * 1000) : null;
22+
$duration = $startTime ? floor((microtime(true) - $startTime) * 1000) : null;
2323
$memory = memory_get_peak_usage(true);
2424

2525
if ($this->shouldLog($event->request, $event->response)) {
@@ -30,7 +30,7 @@ public function handle(RequestHandled $event)
3030
RequestLoggerFacade::driver($driver)->log(
3131
$event->request,
3232
$event->response,
33-
$time,
33+
$duration,
3434
$memory
3535
);
3636
}

src/Models/RequestLog.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ class RequestLog extends Model implements RequestLoggerInterface
4040
'payload',
4141
'response_headers',
4242
'response_body',
43-
'time',
43+
'duration',
4444
'memory',
4545
];
4646

@@ -93,7 +93,7 @@ public function prunable()
9393
}
9494

9595
/** @inerhitDoc */
96-
public function log(Request $request, $response, ?int $time = null, ?int $memory = null): void
96+
public function log(Request $request, $response, ?int $duration = null, ?int $memory = null): void
9797
{
9898
$model = new static();
9999

@@ -109,7 +109,7 @@ public function log(Request $request, $response, ?int $time = null, ?int $memory
109109
$model->payload = $this->getFiltered($request->input()) ?: null;
110110
$model->response_headers = $this->getFiltered($response->headers->all()) ?: null;
111111
$model->response_body = $this->getLoggableResponseContent($response);
112-
$model->time = $time;
112+
$model->duration = $duration;
113113
$model->memory = round($memory / 1024 / 1024, 2); // [MB]
114114

115115
if ($user = $request->user()) {

src/NullLogger.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@
77

88
class NullLogger implements RequestLoggerInterface
99
{
10-
public function log(Request $request, $response, ?int $time = null, ?int $memory = null): void
10+
/** @inheritDoc */
11+
public function log(Request $request, $response, ?int $duration = null, ?int $memory = null): void
1112
{
1213
// Intentionally left blank.
1314
}

0 commit comments

Comments
 (0)