Fix bugs, improve perfs and use SimpleLogger instead of Monolog
This commit is contained in:
@@ -52,6 +52,8 @@ class ClassProvider implements ServiceProviderInterface
|
||||
'Core' => array(
|
||||
'Template',
|
||||
'Session',
|
||||
'MemoryCache',
|
||||
'FileCache',
|
||||
),
|
||||
'Integration' => array(
|
||||
'GitlabWebhook',
|
||||
|
||||
@@ -12,6 +12,7 @@ class DatabaseProvider implements ServiceProviderInterface
|
||||
{
|
||||
$container['db'] = $this->getInstance();
|
||||
$container['db']->stopwatch = DEBUG;
|
||||
$container['db']->log_queries = DEBUG;
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -4,19 +4,19 @@ namespace ServiceProvider;
|
||||
|
||||
use Pimple\Container;
|
||||
use Pimple\ServiceProviderInterface;
|
||||
use Monolog\Logger;
|
||||
use Monolog\Handler\StreamHandler;
|
||||
use Monolog\Handler\SyslogHandler;
|
||||
use SimpleLogger\Logger;
|
||||
use SimpleLogger\Syslog;
|
||||
use SimpleLogger\File;
|
||||
|
||||
class LoggingProvider implements ServiceProviderInterface
|
||||
{
|
||||
public function register(Container $container)
|
||||
{
|
||||
$logger = new Logger('app');
|
||||
$logger->pushHandler(new SyslogHandler('kanboard', LOG_USER, Logger::INFO));
|
||||
$logger = new Logger;
|
||||
$logger->setLogger(new Syslog('kanboard'));
|
||||
|
||||
if (DEBUG) {
|
||||
$logger->pushHandler(new StreamHandler(__DIR__.'/../../data/debug.log', Logger::DEBUG));
|
||||
$logger->setLogger(new File(__DIR__.'/../../data/debug.log'));
|
||||
}
|
||||
|
||||
$container['logger'] = $logger;
|
||||
|
||||
@@ -12,25 +12,22 @@ class MailerProvider implements ServiceProviderInterface
|
||||
{
|
||||
public function register(Container $container)
|
||||
{
|
||||
$container['mailer'] = $this->getInstance();
|
||||
}
|
||||
$container['mailer'] = function () {
|
||||
switch (MAIL_TRANSPORT) {
|
||||
case 'smtp':
|
||||
$transport = Swift_SmtpTransport::newInstance(MAIL_SMTP_HOSTNAME, MAIL_SMTP_PORT);
|
||||
$transport->setUsername(MAIL_SMTP_USERNAME);
|
||||
$transport->setPassword(MAIL_SMTP_PASSWORD);
|
||||
$transport->setEncryption(MAIL_SMTP_ENCRYPTION);
|
||||
break;
|
||||
case 'sendmail':
|
||||
$transport = Swift_SendmailTransport::newInstance(MAIL_SENDMAIL_COMMAND);
|
||||
break;
|
||||
default:
|
||||
$transport = Swift_MailTransport::newInstance();
|
||||
}
|
||||
|
||||
public function getInstance()
|
||||
{
|
||||
switch (MAIL_TRANSPORT) {
|
||||
case 'smtp':
|
||||
$transport = Swift_SmtpTransport::newInstance(MAIL_SMTP_HOSTNAME, MAIL_SMTP_PORT);
|
||||
$transport->setUsername(MAIL_SMTP_USERNAME);
|
||||
$transport->setPassword(MAIL_SMTP_PASSWORD);
|
||||
$transport->setEncryption(MAIL_SMTP_ENCRYPTION);
|
||||
break;
|
||||
case 'sendmail':
|
||||
$transport = Swift_SendmailTransport::newInstance(MAIL_SENDMAIL_COMMAND);
|
||||
break;
|
||||
default:
|
||||
$transport = Swift_MailTransport::newInstance();
|
||||
}
|
||||
|
||||
return $transport;
|
||||
return $transport;
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user