feat: remove persister dependency on g_config_dir

This commit is contained in:
eeff
2023-03-17 15:17:16 +08:00
parent fdfc819c25
commit 214c82b508
4 changed files with 5 additions and 5 deletions
+1 -1
View File
@@ -94,7 +94,7 @@ static inline int reset_password()
"$5$PwFeXpBBIBZuZdZl$fP8fFPWCLoaWcnVXVSR.3Xi8TEqCvX92gjhowNNn6S4",
};
int rv = neu_persister_create();
int rv = neu_persister_create(g_config_dir);
if (0 != rv) {
return rv;
}
+1 -1
View File
@@ -66,7 +66,7 @@ static int neuron_run(const neu_cli_args_t *args)
nlog_warn("neuron process failed enable core dump, ignore");
}
rv = neu_persister_create();
rv = neu_persister_create(args->config_dir);
assert(rv == 0);
zlog_notice(neuron, "neuron process, daemon: %d, version: %s (%s %s)",
+2 -2
View File
@@ -430,7 +430,7 @@ static int apply_schemas(sqlite3 *db, const char *dir)
return rv;
}
int neu_persister_create()
int neu_persister_create(const char *schema_dir)
{
int rv = sqlite3_open(db_file, &global_db);
@@ -455,7 +455,7 @@ int neu_persister_create()
return -1;
}
rv = apply_schemas(global_db, g_config_dir);
rv = apply_schemas(global_db, schema_dir);
if (rv != 0) {
nlog_fatal("db apply schemas fail");
sqlite3_close(global_db);
+1 -1
View File
@@ -84,7 +84,7 @@ static inline void neu_persist_user_info_fini(neu_persist_user_info_t *info)
* Create persister.
* @return 0 on success, -1 otherwise.
*/
int neu_persister_create();
int neu_persister_create(const char *schema_dir);
/**
* Destroy perister.
*/