Merge branch '0.7.x' of github.com:appwrite/appwrite into feat-511-jwt-support
This commit is contained in:
commit
ac05c193b3
3 changed files with 26 additions and 13 deletions
|
@ -34,7 +34,7 @@ return [
|
|||
'CH' => 'Швейцария',
|
||||
'CL' => 'Чили',
|
||||
'CN' => 'Китай',
|
||||
'CI' => `Кот д'Ивоар`,
|
||||
'CI' => 'Кот д\'Ивоар',
|
||||
'CM' => 'Камерун',
|
||||
'CD' => 'ДР Конго',
|
||||
'CG' => 'Република Конго',
|
||||
|
|
|
@ -166,8 +166,8 @@ $register->set('statsd', function () { // Register DB connection
|
|||
});
|
||||
$register->set('cache', function () { // Register cache connection
|
||||
$redis = new Redis();
|
||||
$redis->pconnect(App::getEnv('_APP_REDIS_HOST', '', 2.5),
|
||||
App::getEnv('_APP_REDIS_PORT', ''));
|
||||
$redis->pconnect(App::getEnv('_APP_REDIS_HOST', ''), App::getEnv('_APP_REDIS_PORT', ''));
|
||||
$redis->setOption(Redis::OPT_READ_TIMEOUT, -1);
|
||||
|
||||
return $redis;
|
||||
});
|
||||
|
|
|
@ -20,17 +20,30 @@ use Utopia\Preloader\Preloader;
|
|||
|
||||
include __DIR__.'/controllers/general.php';
|
||||
|
||||
(new Preloader())
|
||||
$preloader = new Preloader();
|
||||
|
||||
foreach ([
|
||||
realpath(__DIR__ . '/../app/config'),
|
||||
realpath(__DIR__ . '/../app/controllers'),
|
||||
realpath(__DIR__ . '/../src'),
|
||||
realpath(__DIR__ . '/../vendor/twig/twig'),
|
||||
realpath(__DIR__ . '/../vendor/guzzlehttp/guzzle'),
|
||||
realpath(__DIR__ . '/../vendor/domnikl'),
|
||||
realpath(__DIR__ . '/../vendor/geoip2'),
|
||||
realpath(__DIR__ . '/../vendor/domnikl'),
|
||||
realpath(__DIR__ . '/../vendor/maxmind'),
|
||||
realpath(__DIR__ . '/../vendor/maxmind-db'),
|
||||
realpath(__DIR__ . '/../vendor/psr/log'),
|
||||
realpath(__DIR__ . '/../vendor/piwik'),
|
||||
realpath(__DIR__ . '/../vendor/symfony'),
|
||||
] as $key => $value) {
|
||||
if($value !== false) {
|
||||
$preloader->ignore($value);
|
||||
}
|
||||
}
|
||||
|
||||
$preloader
|
||||
->paths(realpath(__DIR__ . '/../app/config'))
|
||||
->paths(realpath(__DIR__ . '/../app/controllers'))
|
||||
->paths(realpath(__DIR__ . '/../src'))
|
||||
->ignore(realpath(__DIR__ . '/../vendor/twig/twig'))
|
||||
->ignore(realpath(__DIR__ . '/../vendor/guzzlehttp/guzzle'))
|
||||
->ignore(realpath(__DIR__ . '/../vendor/geoip2'))
|
||||
->ignore(realpath(__DIR__ . '/../vendor/domnikl'))
|
||||
->ignore(realpath(__DIR__ . '/../vendor/maxmind'))
|
||||
->ignore(realpath(__DIR__ . '/../vendor/maxmind-db'))
|
||||
->ignore(realpath(__DIR__ . '/../vendor/psr/log'))
|
||||
->ignore(realpath(__DIR__ . '/../vendor/piwik'))
|
||||
->ignore(realpath(__DIR__ . '/../vendor/symfony'))
|
||||
->load();
|
Loading…
Reference in a new issue