ProVM/emails
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Compare commits

base: ProVM:de81f16557c2af78876a71846a46e1d2fd312195
Branches Tags
ProVM:master ProVM:release ProVM:develop
ProVM:2.0.0 ProVM:1.2.3 ProVM:1.2.2 ProVM:1.2.1 ProVM:1.2.0 ProVM:1.1.1 ProVM:1.1.0 ProVM:1.0.0
..
compare: ProVM:1.2.0
Branches Tags
ProVM:release ProVM:develop ProVM:master
ProVM:2.0.0 ProVM:1.2.3 ProVM:1.2.2 ProVM:1.2.1 ProVM:1.2.0 ProVM:1.1.1 ProVM:1.1.0 ProVM:1.0.0

4 Commits
de81f16557 ... 1.2.0

Author SHA1 Message Date
Aldarien
c400020425 v1.2.0 2022-11-30 20:54:24 -03:00
Aldarien
a76ab77757 v1.1.1 2022-11-30 11:48:55 -03:00
Aldarien
db95b12985 v1.1.0 2022-11-30 10:42:48 -03:00
Aldarien
8648f5a62e v1.0.0 2022-11-29 11:12:35 -03:00
22 changed files with 32 additions and 208 deletions
Expand all files Collapse all files

38
api/common/Middleware/Logging.php
View File

@ -1,38 +0,0 @@
<?php
namespace ProVM\Common\Middleware;
use Psr\Http\Message\ResponseInterface;
use Psr\Http\Message\ServerRequestInterface;
use Psr\Http\Server\RequestHandlerInterface;
use Psr\Log\LoggerInterface;
class Logging
{
public function __construct(LoggerInterface $logger) {
$this->setLogger($logger);
}
protected LoggerInterface $logger;
public function getLogger(): LoggerInterface
{
return $this->logger;
}
public function setLogger(LoggerInterface $logger): Logging
{
$this->logger = $logger;
return $this;
}
public function __invoke(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface
{
$response = $handler->handle($request);
$output = [
'uri' => var_export($request->getUri(), true),
'body' => $request->getBody()->getContents()
];
$this->getLogger()->info(\Safe\json_encode($output, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE));
return $response;
}
}

2
api/setup/middleware/98_log.php
View File

@ -1,2 +0,0 @@
<?php
$app->add($app->getContainer()->get(ProVM\Common\Middleware\Logging::class));

3
api/setup/settings/02_folders.php
View File

@ -18,5 +18,4 @@ return [
]);
},
'attachments_folder' => $_ENV['ATTACHMENTS_FOLDER'],
'logs_folder' => '/logs',
];
];

5
api/setup/setups/04_middlewares.php
View File

@ -7,8 +7,5 @@ return [
$container->get(Nyholm\Psr7\Factory\Psr17Factory::class),
$container->get(Psr\Log\LoggerInterface::class)
);
},
ProVM\Common\Middleware\Logging::class => function(ContainerInterface $container) {
return new ProVM\Common\Middleware\Logging($container->get('request_logger'));
}
];
];

14
api/setup/setups/98_log.php
View File

@ -10,23 +10,13 @@ return [
$handler->setFormatter($container->get(Monolog\Formatter\SyslogFormatter::class));
return $handler;
},
'request_logger' => function(ContainerInterface $container) {
$logger = new Monolog\Logger('request_logger');
$handler = new Monolog\Handler\RotatingFileHandler(implode(DIRECTORY_SEPARATOR, [$container->get('logs_folder'), 'requests.log']));
$handler->setFormatter($container->get(Monolog\Formatter\SyslogFormatter::class));
$dedupHandler = new Monolog\Handler\DeduplicationHandler($handler, null, Monolog\Level::Info);
$logger->pushHandler($dedupHandler);
$logger->pushProcessor($container->get(Monolog\Processor\PsrLogMessageProcessor::class));
$logger->pushProcessor($container->get(Monolog\Processor\IntrospectionProcessor::class));
$logger->pushProcessor($container->get(Monolog\Processor\MemoryUsageProcessor::class));
return $logger;
},
Psr\Log\LoggerInterface::class => function(ContainerInterface $container) {
$logger = new Monolog\Logger('file_logger');
$logger->pushHandler($container->get(Monolog\Handler\DeduplicationHandler::class));
//$logger->pushHandler($container->get(Monolog\Handler\RotatingFileHandler::class));
$logger->pushProcessor($container->get(Monolog\Processor\PsrLogMessageProcessor::class));
$logger->pushProcessor($container->get(Monolog\Processor\IntrospectionProcessor::class));
$logger->pushProcessor($container->get(Monolog\Processor\MemoryUsageProcessor::class));
return $logger;
}
];
];

38
cli/common/Middleware/Logging.php
View File

@ -1,38 +0,0 @@
<?php
namespace ProVM\Common\Middleware;
use Psr\Http\Message\ResponseInterface;
use Psr\Http\Message\ServerRequestInterface;
use Psr\Http\Server\RequestHandlerInterface;
use Psr\Log\LoggerInterface;
class Logging
{
public function __construct(LoggerInterface $logger) {
$this->setLogger($logger);
}
protected LoggerInterface $logger;
public function getLogger(): LoggerInterface
{
return $this->logger;
}
public function setLogger(LoggerInterface $logger): Logging
{
$this->logger = $logger;
return $this;
}
public function __invoke(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface
{
$response = $handler->handle($request);
$output = [
'uri' => var_export($request->getUri(), true),
'body' => $request->getBody()->getContents()
];
$this->getLogger()->info(\Safe\json_encode($output, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE));
return $response;
}
}

1
cli/public/index.php
View File

@ -4,7 +4,6 @@ $app = require_once implode(DIRECTORY_SEPARATOR, [
'setup',
'app.php'
]);
Monolog\ErrorHandler::register($app->getContainer()->get(Psr\Log\LoggerInterface::class));
try {
$app->run();
} catch (Error | Exception $e) {

2
cli/setup/middleware/98_log.php
View File

@ -1,2 +0,0 @@
<?php
$app->add($app->getContainer()->get(ProVM\Common\Middleware\Logging::class));

3
cli/setup/settings/02_folders.php
View File

@ -14,6 +14,5 @@ return [
$container->get('resources_folder'),
'commands'
]);
},
'logs_folder' => '/logs',
}
];

8
cli/setup/setups/03_middleware.php
View File

@ -1,8 +0,0 @@
<?php
use Psr\Container\ContainerInterface;
return [
ProVM\Common\Middleware\Logging::class => function(ContainerInterface $container) {
return new ProVM\Common\Middleware\Logging($container->get('request_logger'));
}
];

30
cli/setup/setups/98_log.php
View File

@ -2,28 +2,14 @@
use Psr\Container\ContainerInterface;
return [
Monolog\Handler\RotatingFileHandler::class => function(ContainerInterface $container) {
$handler = new Monolog\Handler\RotatingFileHandler($container->get('log_file'));
$handler->setFormatter($container->get(Monolog\Formatter\LineFormatter::class));
\Monolog\Handler\RotatingFileHandler::class => function(ContainerInterface $container) {
$handler = new \Monolog\Handler\RotatingFileHandler($container->get('log_file'));
$handler->setFormatter($container->get(\Monolog\Formatter\LineFormatter::class));
return $handler;
},
'request_logger' => function(ContainerInterface $container) {
$logger = new Monolog\Logger('request_logger');
$handler = new Monolog\Handler\RotatingFileHandler(implode(DIRECTORY_SEPARATOR, [$container->get('logs_folder'), 'requests.log']));
$handler->setFormatter($container->get(Monolog\Formatter\SyslogFormatter::class));
$dedupHandler = new Monolog\Handler\DeduplicationHandler($handler, null, Monolog\Level::Info);
$logger->pushHandler($dedupHandler);
$logger->pushProcessor($container->get(Monolog\Processor\PsrLogMessageProcessor::class));
$logger->pushProcessor($container->get(Monolog\Processor\IntrospectionProcessor::class));
$logger->pushProcessor($container->get(Monolog\Processor\MemoryUsageProcessor::class));
\Psr\Log\LoggerInterface::class => function(ContainerInterface $container) {
$logger = new \Monolog\Logger('file_logger');
$logger->pushHandler($container->get(\Monolog\Handler\RotatingFileHandler::class));
return $logger;
},
Psr\Log\LoggerInterface::class => function(ContainerInterface $container) {
$logger = new Monolog\Logger('file_logger');
$logger->pushHandler($container->get(Monolog\Handler\RotatingFileHandler::class));
$logger->pushProcessor($container->get(Monolog\Processor\PsrLogMessageProcessor::class));
$logger->pushProcessor($container->get(Monolog\Processor\IntrospectionProcessor::class));
$logger->pushProcessor($container->get(Monolog\Processor\MemoryUsageProcessor::class));
return $logger;
},
];
}
];

7
ui/common/Controller/Api.php
View File

@ -4,13 +4,14 @@ namespace ProVM\Common\Controller;
use Psr\Http\Message\ResponseInterface;
use Psr\Http\Message\ServerRequestInterface;
use ProVM\Common\Service\Api as Service;
use Psr\Log\LoggerInterface;
class Api
{
public function __invoke(ServerRequestInterface $request, ResponseInterface $response, Service $service, LoggerInterface $logger): ResponseInterface
public function __invoke(ServerRequestInterface $request, ResponseInterface $response, Service $service): ResponseInterface
{
$json = $request->getParsedBody();
$body = $request->getBody();
$json = \Safe\json_decode($body->getContents(), JSON_OBJECT_AS_ARRAY);
return $service->sendRequest($json);
}
}

38
ui/common/Middleware/Logging.php
View File

@ -1,38 +0,0 @@
<?php
namespace ProVM\Common\Middleware;
use Psr\Http\Message\ResponseInterface;
use Psr\Http\Message\ServerRequestInterface;
use Psr\Http\Server\RequestHandlerInterface;
use Psr\Log\LoggerInterface;
class Logging
{
public function __construct(LoggerInterface $logger) {
$this->setLogger($logger);
}
protected LoggerInterface $logger;
public function getLogger(): LoggerInterface
{
return $this->logger;
}
public function setLogger(LoggerInterface $logger): Logging
{
$this->logger = $logger;
return $this;
}
public function __invoke(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface
{
$response = $handler->handle($request);
$output = [
'uri' => var_export($request->getUri(), true),
'body' => $request->getParsedBody()
];
$this->getLogger()->info(\Safe\json_encode($output, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE));
return $response;
}
}

1
ui/public/index.php
View File

@ -8,7 +8,6 @@ Monolog\ErrorHandler::register($app->getContainer()->get(Psr\Log\LoggerInterface
try {
$app->run();
} catch (Error | Exception $e) {
$app->getContainer()->get(Psr\Log\LoggerInterface::class)->debug(json_encode(compact('_REQUEST')));
$app->getContainer()->get(Psr\Log\LoggerInterface::class)->error($e);
throw $e;
}

2
ui/resources/routes/98_api.php
View File

@ -1,4 +1,4 @@
<?php
use ProVM\Common\Controller\Api;
$app->post('/api[/]', Api::class);
$app->post('/api', Api::class);

6
ui/resources/views/emails/show.blade.php
View File

@ -3,7 +3,7 @@
@section('emails_content')
<h3>Message - <span id="subject"></span> - <span id="from"></span></h3>
<h4 id="date_time"></h4>
<div class="ui bulleted link list" id="attachments"></div>
<div class="ui list" id="attachments"></div>
@endsection
@push('page_scripts')
@ -82,7 +82,7 @@
attachments: parent => {
this.get().attachments().forEach(attachment => {
parent.append(
$('<a></a>').attr('href', '{{$urls->base}}/attachment/' + attachment.id).attr('download', attachment.fullname).html(attachment.fullname)
$('<a></a>').attr('href', _urls.base + '/attachment/' + attachment.id).attr('download', attachment.fullname).html(attachment.fullname)
)
})
}
@ -100,4 +100,4 @@
message.setup('{{$message_id}}')
})
</script>
@endpush
@endpush

9
ui/resources/views/layout/body/footer/scripts/main.blade.php
View File

@ -3,17 +3,18 @@
base_url: '{{$urls->api}}',
base: function({method, uri, data = null}) {
const request = {
uri: uri,
uri: uri.replace(/^\//g, ''),
method
}
const options = {
url: this.base_url,
method: 'post',
contentType: 'application/json'
}
if (method.toLowerCase() !== 'get' && data !== null) {
request['data'] = data
}
options['data'] = request
options['data'] = JSON.stringify(request)
return $.ajax(options)
},
get: function(uri) {
@ -29,5 +30,5 @@
return this.base({method: 'delete', uri, data})
}
}
//const _urls = JSON.parse('{!! Safe\json_encode($urls) !!}')
</script>
const _urls = JSON.parse('{!! Safe\json_encode($urls) !!}')
</script>

2
ui/setup/middleware/98_log.php
View File

@ -1,2 +0,0 @@
<?php
$app->add($app->getContainer()->get(ProVM\Common\Middleware\Logging::class));

3
ui/setup/settings/02_folders.php
View File

@ -20,7 +20,6 @@ return [
$arr['base'],
'cache'
]);
$arr['logs'] = '/logs';
return (object) $arr;
}
];
];

4
ui/setup/setups/02_api.php
View File

@ -4,7 +4,7 @@ use Psr\Container\ContainerInterface;
return [
Psr\Http\Client\ClientInterface::class => function(ContainerInterface $container) {
return new GuzzleHttp\Client([
'base_uri' => $container->get('urls')->api,
'base_uri' => "http://proxy:8080",
'headers' => [
'Authorization' => [
"Bearer {$container->get('api_key')}"
@ -15,4 +15,4 @@ return [
Psr\Http\Message\RequestFactoryInterface::class => function(ContainerInterface $container) {
return $container->get(Nyholm\Psr7\Factory\Psr17Factory::class);
},
];
];

8
ui/setup/setups/04_middleware.php
View File

@ -1,8 +0,0 @@
<?php
use Psr\Container\ContainerInterface;
return [
ProVM\Common\Middleware\Logging::class => function(ContainerInterface $container) {
return new ProVM\Common\Middleware\Logging($container->get('request_logger'));
}
];

16
ui/setup/setups/98_log.php
View File

@ -10,23 +10,13 @@ return [
$handler->setFormatter($container->get(Monolog\Formatter\SyslogFormatter::class));
return $handler;
},
'request_logger' => function(ContainerInterface $container) {
$logger = new Monolog\Logger('request_logger');
$handler = new Monolog\Handler\RotatingFileHandler(implode(DIRECTORY_SEPARATOR, [$container->get('folders')->logs, 'requests.log']));
$handler->setFormatter($container->get(Monolog\Formatter\SyslogFormatter::class));
$dedupHandler = new Monolog\Handler\DeduplicationHandler($handler, null, Monolog\Level::Info);
$logger->pushHandler($dedupHandler);
$logger->pushProcessor($container->get(Monolog\Processor\PsrLogMessageProcessor::class));
$logger->pushProcessor($container->get(Monolog\Processor\IntrospectionProcessor::class));
$logger->pushProcessor($container->get(Monolog\Processor\MemoryUsageProcessor::class));
return $logger;
},
Psr\Log\LoggerInterface::class => function(ContainerInterface $container) {
$logger = new Monolog\Logger('file_logger');
$logger->pushHandler($container->get(Monolog\Handler\DeduplicationHandler::class));
//$logger->pushHandler($container->get(Monolog\Handler\RotatingFileHandler::class));
$logger->pushProcessor($container->get(Monolog\Processor\PsrLogMessageProcessor::class));
$logger->pushProcessor($container->get(Monolog\Processor\IntrospectionProcessor::class));
$logger->pushProcessor($container->get(Monolog\Processor\MemoryUsageProcessor::class));
return $logger;
},
];
}
];