mirror of
https://github.com/slawkens/myaac.git
synced 2026-04-23 10:53:32 +02:00
[WIP] Loading of config .toml's
Deprecate load_config_lua, use MyAAC\Server\Lua\Loader::load instead
This commit is contained in:
@@ -14,6 +14,7 @@ use MyAAC\CsrfToken;
|
||||
use MyAAC\Hooks;
|
||||
use MyAAC\Plugins;
|
||||
use MyAAC\Models\Town;
|
||||
use MyAAC\Server\Config;
|
||||
use MyAAC\Server\Vocations;
|
||||
use MyAAC\Settings;
|
||||
|
||||
@@ -90,28 +91,20 @@ foreach($_REQUEST as $var => $value) {
|
||||
}
|
||||
|
||||
// load otserv config file
|
||||
$config_lua_reload = true;
|
||||
if($cache->enabled()) {
|
||||
$tmp = null;
|
||||
if($cache->fetch('server_path', $tmp) && $tmp == $config['server_path']) {
|
||||
$tmp = null;
|
||||
if($cache->fetch('config_lua', $tmp) && $tmp) {
|
||||
$config['lua'] = unserialize($tmp);
|
||||
$config_lua_reload = false;
|
||||
}
|
||||
if(!$cache->fetch('server_path', $tmp) || $tmp != config('server_path')) {
|
||||
$cache->delete('config_server');
|
||||
}
|
||||
}
|
||||
|
||||
if($config_lua_reload) {
|
||||
$config['lua'] = load_config_lua($config['server_path'] . 'config.lua');
|
||||
if (empty($config['server'])) {
|
||||
$config['server'] = $config['lua'] = Config::get();
|
||||
|
||||
// cache config
|
||||
if($cache->enabled()) {
|
||||
$cache->set('config_lua', serialize($config['lua']), 2 * 60);
|
||||
$cache->set('server_path', $config['server_path'], 10 * 60);
|
||||
$cache->set('server_path', config('server_path'), 10 * 60);
|
||||
}
|
||||
}
|
||||
unset($tmp);
|
||||
|
||||
if(isset($config['lua']['servername']))
|
||||
$config['lua']['serverName'] = $config['lua']['servername'];
|
||||
|
||||
Reference in New Issue
Block a user