diff --git a/composer.json b/composer.json index 186deb3..d7aef26 100644 --- a/composer.json +++ b/composer.json @@ -42,9 +42,11 @@ "doctrine/orm": "^2.6", "gedmo/doctrine-extensions": "^2.4", "los/basepath": "^2.0", + "los/loslog": "^3.1", "roave/security-advisories": "dev-master", "symfony/console": "^4.0", "tuupola/cors-middleware": "^0.7.0", + "zendframework/zend-code": "^3.3", "zendframework/zend-component-installer": "^2.1.1", "zendframework/zend-config-aggregator": "^1.0", "zendframework/zend-diactoros": "^1.7.1", @@ -56,6 +58,7 @@ "zendframework/zend-form": "^2.11", "zendframework/zend-hydrator": "^2.3", "zendframework/zend-json": "^3.1", + "zendframework/zend-log": "^2.10", "zendframework/zend-servicemanager": "^3.3", "zendframework/zend-stdlib": "^3.1" }, diff --git a/composer.lock b/composer.lock index ec226a0..c9c08d6 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "content-hash": "6f542226fd1397584904ae95fce0124b", + "content-hash": "eada4b0e60e35c9a3f5d5bcf347984fc", "packages": [ { "name": "behat/transliterator", @@ -962,6 +962,74 @@ "homepage": "https://github.com/lansoweb/basepath", "time": "2018-03-27T11:46:22+00:00" }, + { + "name": "los/loslog", + "version": "3.1.0", + "source": { + "type": "git", + "url": "https://github.com/Lansoweb/LosLog.git", + "reference": "a6dc0138f2db721ffa134d495972c20b2da2e7b6" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/Lansoweb/LosLog/zipball/a6dc0138f2db721ffa134d495972c20b2da2e7b6", + "reference": "a6dc0138f2db721ffa134d495972c20b2da2e7b6", + "shasum": "" + }, + "require": { + "php": "^7.1", + "psr/container": "^1.0", + "psr/log": "^1.0", + "zendframework/zend-diactoros": "^1.7", + "zendframework/zend-log": "^2.9", + "zendframework/zend-stratigility": "^3.0" + }, + "require-dev": { + "mikey179/vfsstream": "^1.6", + "phpstan/phpstan": "^0.9.2", + "phpunit/phpunit": "^7.0", + "rollbar/rollbar": "^1.4", + "satooshi/php-coveralls": "^2.0", + "squizlabs/php_codesniffer": "^2.7", + "zendframework/zend-coding-standard": "^1.0" + }, + "suggest": { + "rollbar/rollbar": "Needed if you want to use Rollbar logger" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-develop": "2.0-dev" + } + }, + "autoload": { + "psr-4": { + "LosMiddleware\\LosLog\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Leandro Silva", + "email": "leandro@leandrosilva.info", + "homepage": "http://leandrosilva.info" + } + ], + "description": "LosLog provides some log utility", + "homepage": "http://github.com/Lansoweb/LosLog", + "keywords": [ + "expressive", + "log", + "los", + "module", + "zf2", + "zf3" + ], + "time": "2018-03-16T13:02:56+00:00" + }, { "name": "neomerx/cors-psr7", "version": "v1.0.12", @@ -1762,6 +1830,59 @@ ], "time": "2017-07-15T22:03:15+00:00" }, + { + "name": "zendframework/zend-code", + "version": "3.3.0", + "source": { + "type": "git", + "url": "https://github.com/zendframework/zend-code.git", + "reference": "6b1059db5b368db769e4392c6cb6cc139e56640d" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/zendframework/zend-code/zipball/6b1059db5b368db769e4392c6cb6cc139e56640d", + "reference": "6b1059db5b368db769e4392c6cb6cc139e56640d", + "shasum": "" + }, + "require": { + "php": "^7.1", + "zendframework/zend-eventmanager": "^2.6 || ^3.0" + }, + "require-dev": { + "doctrine/annotations": "~1.0", + "ext-phar": "*", + "phpunit/phpunit": "^6.2.3", + "zendframework/zend-coding-standard": "^1.0.0", + "zendframework/zend-stdlib": "^2.7 || ^3.0" + }, + "suggest": { + "doctrine/annotations": "Doctrine\\Common\\Annotations >=1.0 for annotation features", + "zendframework/zend-stdlib": "Zend\\Stdlib component" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.2-dev", + "dev-develop": "3.3-dev" + } + }, + "autoload": { + "psr-4": { + "Zend\\Code\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "description": "provides facilities to generate arbitrary code using an object oriented interface", + "homepage": "https://github.com/zendframework/zend-code", + "keywords": [ + "code", + "zf2" + ], + "time": "2017-10-20T15:21:32+00:00" + }, { "name": "zendframework/zend-component-installer", "version": "2.1.1", @@ -2709,6 +2830,77 @@ ], "time": "2018-01-04T17:51:34+00:00" }, + { + "name": "zendframework/zend-log", + "version": "2.10.0", + "source": { + "type": "git", + "url": "https://github.com/zendframework/zend-log.git", + "reference": "9cec3b092acb39963659c2f32441cccc56b3f430" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/zendframework/zend-log/zipball/9cec3b092acb39963659c2f32441cccc56b3f430", + "reference": "9cec3b092acb39963659c2f32441cccc56b3f430", + "shasum": "" + }, + "require": { + "php": "^5.6 || ^7.0", + "psr/log": "^1.0", + "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3", + "zendframework/zend-stdlib": "^2.7 || ^3.0" + }, + "provide": { + "psr/log-implementation": "1.0.0" + }, + "require-dev": { + "mikey179/vfsstream": "^1.6", + "phpunit/phpunit": "^5.7.15 || ^6.0.8", + "zendframework/zend-coding-standard": "~1.0.0", + "zendframework/zend-db": "^2.6", + "zendframework/zend-escaper": "^2.5", + "zendframework/zend-filter": "^2.5", + "zendframework/zend-mail": "^2.6.1", + "zendframework/zend-validator": "^2.10.1" + }, + "suggest": { + "ext-mongo": "mongo extension to use Mongo writer", + "ext-mongodb": "mongodb extension to use MongoDB writer", + "zendframework/zend-console": "Zend\\Console component to use the RequestID log processor", + "zendframework/zend-db": "Zend\\Db component to use the database log writer", + "zendframework/zend-escaper": "Zend\\Escaper component, for use in the XML log formatter", + "zendframework/zend-mail": "Zend\\Mail component to use the email log writer", + "zendframework/zend-validator": "Zend\\Validator component to block invalid log messages" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.10.x-dev", + "dev-develop": "2.11.x-dev" + }, + "zf": { + "component": "Zend\\Log", + "config-provider": "Zend\\Log\\ConfigProvider" + } + }, + "autoload": { + "psr-4": { + "Zend\\Log\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "description": "component for general purpose logging", + "homepage": "https://github.com/zendframework/zend-log", + "keywords": [ + "log", + "logging", + "zf2" + ], + "time": "2018-04-09T21:59:51+00:00" + }, { "name": "zendframework/zend-servicemanager", "version": "3.3.2", @@ -4549,59 +4741,6 @@ ], "time": "2018-01-29T19:49:41+00:00" }, - { - "name": "zendframework/zend-code", - "version": "3.3.0", - "source": { - "type": "git", - "url": "https://github.com/zendframework/zend-code.git", - "reference": "6b1059db5b368db769e4392c6cb6cc139e56640d" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-code/zipball/6b1059db5b368db769e4392c6cb6cc139e56640d", - "reference": "6b1059db5b368db769e4392c6cb6cc139e56640d", - "shasum": "" - }, - "require": { - "php": "^7.1", - "zendframework/zend-eventmanager": "^2.6 || ^3.0" - }, - "require-dev": { - "doctrine/annotations": "~1.0", - "ext-phar": "*", - "phpunit/phpunit": "^6.2.3", - "zendframework/zend-coding-standard": "^1.0.0", - "zendframework/zend-stdlib": "^2.7 || ^3.0" - }, - "suggest": { - "doctrine/annotations": "Doctrine\\Common\\Annotations >=1.0 for annotation features", - "zendframework/zend-stdlib": "Zend\\Stdlib component" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.2-dev", - "dev-develop": "3.3-dev" - } - }, - "autoload": { - "psr-4": { - "Zend\\Code\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "description": "provides facilities to generate arbitrary code using an object oriented interface", - "homepage": "https://github.com/zendframework/zend-code", - "keywords": [ - "code", - "zf2" - ], - "time": "2017-10-20T15:21:32+00:00" - }, { "name": "zendframework/zend-expressive-tooling", "version": "1.0.1", diff --git a/config/autoload/loslog.global.php b/config/autoload/loslog.global.php new file mode 100644 index 0000000..cd1cfc3 --- /dev/null +++ b/config/autoload/loslog.global.php @@ -0,0 +1,27 @@ + [ + 'factories' => [ + LosMiddleware\LosLog\LosLog::class => LosMiddleware\LosLog\LosLogFactory::class, + LosMiddleware\LosLog\HttpLog::class => LosMiddleware\LosLog\HttpLogFactory::class, + Psr\Log\LoggerInterface::class => LosMiddleware\LosLog\LoggerFactory::class, + ], + 'delegators' => [ + ErrorHandler::class => [ + LosMiddleware\LosLog\ErrorHandlerListenerDelegatorFactory::class, + ], + ], + ], + 'loslog' => [ + 'log_dir' => 'data/logs', + 'error_logger_file' => 'error.log', + 'exception_logger_file' => 'exception.log', + 'static_logger_file' => 'static.log', + 'http_logger_file' => 'http.log', + 'log_request' => false, + 'log_response' => false, + 'full' => false, + ], +]; diff --git a/config/config.php b/config/config.php index 70cd721..26e7106 100644 --- a/config/config.php +++ b/config/config.php @@ -13,6 +13,7 @@ $cacheConfig = [ ]; $aggregator = new ConfigAggregator([ + \Zend\Log\ConfigProvider::class, \Zend\Form\ConfigProvider::class, \Zend\InputFilter\ConfigProvider::class, \Zend\Validator\ConfigProvider::class, diff --git a/deploy.php b/deploy.php index f9aa0e3..ef9c8e1 100644 --- a/deploy.php +++ b/deploy.php @@ -11,6 +11,7 @@ set('shared_files', [ 'config/autoload/local.php', 'config/autoload/los-basepath.local.php', 'config/autoload/doctrine.local.php', + 'data/production.db', ]); /* set('shared_dirs', [