From 5127f737be4976cc2f036803ebb51d4ea2890d87 Mon Sep 17 00:00:00 2001
From: eeff <33566201+eeff@users.noreply.github.com>
Date: Tue, 31 Jan 2023 18:09:56 +0800
Subject: [PATCH] feat: remove persister dependency on `g_config_dir`

---
 src/argparse.c        | 2 +-
 src/main.c            | 2 +-
 src/persist/persist.c | 4 ++--
 src/persist/persist.h | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/argparse.c b/src/argparse.c
index 1f73034c..1e0db0fd 100644
--- a/src/argparse.c
+++ b/src/argparse.c
@@ -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;
     }
diff --git a/src/main.c b/src/main.c
index b536ed40..5d323536 100644
--- a/src/main.c
+++ b/src/main.c
@@ -65,7 +65,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)",
diff --git a/src/persist/persist.c b/src/persist/persist.c
index f1dacdf6..0953c06a 100644
--- a/src/persist/persist.c
+++ b/src/persist/persist.c
@@ -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);
diff --git a/src/persist/persist.h b/src/persist/persist.h
index 09cef08f..7588d568 100644
--- a/src/persist/persist.h
+++ b/src/persist/persist.h
@@ -86,7 +86,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.
  */