Skip to content

Commit d4e82e3

Browse files
authored
Merge pull request #4 from pnlinh/feature/add-config
Add new config
2 parents 255b0df + a5f5185 commit d4e82e3

File tree

6 files changed

+81
-8
lines changed

6 files changed

+81
-8
lines changed

Diff for: Makefile

+38
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
help:
2+
@grep -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "⚡ \033[34m%-30s\033[0m %s\n", $$1, $$2}'
3+
4+
install: build run
5+
test: build run test
6+
7+
build: ## Build Docker image for local development
8+
docker-compose build
9+
10+
start: run
11+
run: ## Run application Docker. Run 'make build' first
12+
docker-compose up -d
13+
14+
status: ps
15+
ps: ### Alias of docker-composer ps command
16+
docker-compose ps
17+
18+
restart: ## Restart containers
19+
docker-compose restart
20+
21+
test: ### Run unit testing
22+
docker-compose exec app sh -c "composer test"
23+
24+
stop: ## Stop application running in Docker
25+
docker-compose kill
26+
27+
destroy: ## Alias docker-compose down command
28+
docker-compose down
29+
down: destroy
30+
31+
logs: ## View container logs
32+
docker-compose logs -ft app
33+
34+
shell: ## Enter bash in running Docker container
35+
docker-compose exec app sh
36+
37+
root: ## Enter bash in running Docker container as root user
38+
docker-compose exec --user root app sh

Diff for: README.md

+19-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
# Enable/disable query logger in Laravel/Lumen
2+
23
[![StyleCI](https://github.styleci.io/repos/477752604/shield?branch=master)](https://github.styleci.io/repos/477752604?branch=master)
34
[![CircleCI](https://circleci.com/gh/pnlinh/laravel-query-logger/tree/master.svg?style=svg)](https://circleci.com/gh/pnlinh/laravel-query-logger/tree/master)
45

@@ -15,24 +16,40 @@ Require this package with composer.
1516
composer require pnlinh/laravel-query-logger --dev
1617
```
1718

19+
To publishes config `config/query-logger.php`, use command:
20+
21+
```shell
22+
php artisan vendor:publish --tag="query-logger"
23+
```
24+
1825
## Usage
1926

2027
To enable log query, set .env file below
28+
2129
```
22-
APP_DEBUG=true
30+
QUERY_LOGGER_ENABLED=true
2331
```
2432

2533
To disable log query, set .env file below
34+
2635
```
27-
APP_DEBUG=false
36+
QUERY_LOGGER_ENABLED=false
2837
```
2938

3039
## Test
3140

41+
- Without Docker
42+
3243
```bash
3344
composer test
3445
```
3546

47+
- With Docker
48+
49+
```bash
50+
make test
51+
```
52+
3653
## Credits
3754

3855
- [Ngoc Linh Pham](https://github.com/pnlinh)

Diff for: config/query-logger.php

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
<?php
2+
3+
return [
4+
/*
5+
|--------------------------------------------------------------------------
6+
| Query Logger Settings
7+
|--------------------------------------------------------------------------
8+
| Query logger is disabled by default. You can enable by setting enable to true.
9+
|
10+
*/
11+
'enabled' => env('QUERY_LOGGER_ENABLED', false),
12+
];

Diff for: docker-compose.yml

+2-4
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
1-
version: '2'
1+
version: '3'
22

33
services:
44
app:
5-
image: shinsenter/laravel:php8.0
5+
image: pnlinh/php:80
66
volumes:
77
- ./:/var/www/html
8-
networks:
9-
- localnet

Diff for: src/QueryLoggerServiceProvider.php

+9-1
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,19 @@ class QueryLoggerServiceProvider extends ServiceProvider
2020
*
2121
* @param Request $request
2222
*
23+
* @throws \Illuminate\Contracts\Container\BindingResolutionException
24+
*
2325
* @return void
2426
*/
2527
public function boot(Request $request)
2628
{
27-
if (!config('app.debug')) {
29+
if ($this->app->runningInConsole()) {
30+
$this->publishes([
31+
__DIR__.'/../config/query-logger.php' => config_path('query-logger.php'),
32+
], 'query-logger');
33+
}
34+
35+
if (!config('query-logger.enabled')) {
2836
return;
2937
}
3038

Diff for: tests/TestCase.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public function getEnvironmentSetUp($app)
2828
'database' => ':memory:',
2929
'prefix' => '',
3030
]);
31-
$app['config']->set('app.debug', true);
31+
$app['config']->set('query-logger.enabled', true);
3232
$app['config']->set('app.logging.default', 'single');
3333

3434
Schema::create('users', function (Blueprint $table) {

0 commit comments

Comments
 (0)