Github
/
FTL
mirror of
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1906 from pi-hole/tweak/goodbye_adam_mode 

Goodbye Adam mode
This commit is contained in:
Dominik 2024-03-12 21:34:48 +01:00 committed by GitHub
parent ad06e920a3 0eeeb8109c
commit 2f38061f02
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 1 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/config/toml_reader.c
View File

@ -115,17 +115,10 @@ bool readFTLtoml(struct config *oldconf, struct config *newconf,
return false;
}
// Check if we are in Adam mode
// (only read the env vars)
const char *envvar = getenv("FTLCONF_ENV_ONLY");
const bool adam_mode = (envvar != NULL &&
(strcmp(envvar, "true") == 0 ||
strcmp(envvar, "yes") == 0));
// Try to read debug config. This is done before the full config
// parsing to allow for debug output further down
// First try to read env variable, if this fails, read TOML
if((teleporter || !readEnvValue(&newconf->debug.config, newconf)) && !adam_mode)
if(teleporter || !readEnvValue(&newconf->debug.config, newconf))
{
toml_table_t *conf_debug = toml_table_in(toml, "debug");
if(conf_debug)
@ -153,10 +146,6 @@ bool readFTLtoml(struct config *oldconf, struct config *newconf,
continue;
}
// Do not read TOML file when in Adam mode
if(adam_mode)
continue;
// Get config path depth
unsigned int level = config_path_depth(new_conf_item->p);