Use SharpConfig format for the pre-database config.

This commit is contained in:
flash 2023-10-21 23:45:40 +00:00
parent 727d0650ce
commit b221904866
6 changed files with 72 additions and 69 deletions

View file

@ -4,6 +4,7 @@ namespace Misuzu;
use Index\Environment;
use Index\Data\DbTools;
use Syokuhou\DbConfig;
use Syokuhou\SharpConfig;
define('MSZ_STARTUP', microtime(true));
define('MSZ_ROOT', __DIR__);
@ -22,21 +23,22 @@ Environment::setDebug(MSZ_DEBUG);
mb_internal_encoding('utf-8');
date_default_timezone_set('utc');
$cfg = parse_ini_file(MSZ_CONFIG . '/config.ini', true, INI_SCANNER_TYPED);
$cfg = SharpConfig::fromFile(MSZ_CONFIG . '/config.cfg');
if(!empty($cfg['sentry-dsn'])) {
\Sentry\init([
'dsn' => $cfg['sentry-dsn'],
'traces_sample_rate' => $cfg['sentry-traces-rate'] ?? 0.2,
'profiles_sample_rate' => $cfg['sentry-profiles-rate'] ?? 0.2,
]);
if($cfg->hasValues('sentry:dsn'))
(function($cfg) {
\Sentry\init([
'dsn' => $cfg->getString('dsn'),
'traces_sample_rate' => $cfg->getFloat('tracesRate', 0.2),
'profiles_sample_rate' => $cfg->getFloat('profilesRate', 0.2),
]);
set_exception_handler(function(\Throwable $ex) {
\Sentry\captureException($ex);
});
}
set_exception_handler(function(\Throwable $ex) {
\Sentry\captureException($ex);
});
})($cfg->scopeTo('sentry'));
$db = DbTools::create($cfg['dsn'] ?? 'null:');
$db = DbTools::create($cfg->getString('database:dsn', 'null:'));
$db->execute('SET SESSION time_zone = \'+00:00\', sql_mode = \'STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION\';');
$cfg = new DbConfig($db, 'msz_config');