taler/exchange
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

load config file from correct location

Browse Source
This commit is contained in:
Florian Dold 2021-08-04 21:49:21 +02:00
parent b83ec3a794
commit adf854cd4a
No known key found for this signature in database
GPG Key ID: D2E4F00F29D02A4B
5 changed files with 36 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/auditor/taler-auditor-exchange.c
View File

@ -104,7 +104,13 @@ main (int argc,
return EXIT_INVALIDARGUMENT; return EXIT_INVALIDARGUMENT;
} }
if (NULL == cfgfile) if (NULL == cfgfile)
cfgfile = GNUNET_strdup (GNUNET_OS_project_data_get ()->user_config_file); cfgfile = GNUNET_CONFIGURATION_default_filename ();
if (NULL == cfgfile)
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
"Can't find default configuration file.\n");
return EXIT_NOTCONFIGURED;
}
cfg = GNUNET_CONFIGURATION_create (); cfg = GNUNET_CONFIGURATION_create ();
GNUNET_log (GNUNET_ERROR_TYPE_INFO, GNUNET_log (GNUNET_ERROR_TYPE_INFO,

8
src/auditor/taler-auditor-httpd.c
View File

@ -591,7 +591,13 @@ main (int argc,
(NULL == loglev) ? "INFO" : loglev, (NULL == loglev) ? "INFO" : loglev,
logfile)); logfile));
if (NULL == cfgfile) if (NULL == cfgfile)
cfgfile = GNUNET_strdup (GNUNET_OS_project_data_get ()->user_config_file); cfgfile = GNUNET_CONFIGURATION_default_filename ();
if (NULL == cfgfile)
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
"Can't find default configuration file.\n");
return EXIT_NOTCONFIGURED;
}
cfg = GNUNET_CONFIGURATION_create (); cfg = GNUNET_CONFIGURATION_create ();
if (GNUNET_SYSERR == if (GNUNET_SYSERR ==
GNUNET_CONFIGURATION_load (cfg, GNUNET_CONFIGURATION_load (cfg,

9
src/benchmark/taler-bank-benchmark.c
View File

@ -775,8 +775,13 @@ main (int argc,
return BAD_CONFIG_FILE; return BAD_CONFIG_FILE;
} }
if (NULL == cfg_filename) if (NULL == cfg_filename)
cfg_filename = GNUNET_strdup ( cfg_filename = GNUNET_CONFIGURATION_default_filename ();
GNUNET_OS_project_data_get ()->user_config_file); if (NULL == cfg_filename)
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
"Can't find default configuration file.\n");
return EXIT_NOTCONFIGURED;
}
cfg = GNUNET_CONFIGURATION_create (); cfg = GNUNET_CONFIGURATION_create ();
if (GNUNET_OK != if (GNUNET_OK !=
GNUNET_CONFIGURATION_load (cfg, GNUNET_CONFIGURATION_load (cfg,

9
src/benchmark/taler-exchange-benchmark.c
View File

@ -990,8 +990,13 @@ main (int argc,
return BAD_CONFIG_FILE; return BAD_CONFIG_FILE;
} }
if (NULL == cfg_filename) if (NULL == cfg_filename)
cfg_filename = GNUNET_strdup ( cfg_filename = GNUNET_CONFIGURATION_default_filename ();
GNUNET_OS_project_data_get ()->user_config_file); if (NULL == cfg_filename)
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
"Can't find default configuration file.\n");
return EXIT_NOTCONFIGURED;
}
cfg = GNUNET_CONFIGURATION_create (); cfg = GNUNET_CONFIGURATION_create ();
if (GNUNET_OK != if (GNUNET_OK !=
GNUNET_CONFIGURATION_load (cfg, GNUNET_CONFIGURATION_load (cfg,

9
src/exchange/taler-exchange-httpd.c
View File

@ -1688,7 +1688,14 @@ main (int argc,
GNUNET_free (loglev); GNUNET_free (loglev);
GNUNET_free (logfile); GNUNET_free (logfile);
if (NULL == cfgfile) if (NULL == cfgfile)
cfgfile = GNUNET_strdup (GNUNET_OS_project_data_get ()->user_config_file); cfgfile = GNUNET_CONFIGURATION_default_filename ();
if (NULL == cfgfile)
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
"Can't find default configuration file.\n");
return EXIT_NOTCONFIGURED;
}
TEH_cfg = GNUNET_CONFIGURATION_create (); TEH_cfg = GNUNET_CONFIGURATION_create ();
if (GNUNET_SYSERR == if (GNUNET_SYSERR ==
GNUNET_CONFIGURATION_load (TEH_cfg, GNUNET_CONFIGURATION_load (TEH_cfg,