From 214c82b508600a0f704074ebad3c94123908d09b 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 1/2] 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 80e5a0a7..372e332f 100644
--- a/src/main.c
+++ b/src/main.c
@@ -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)",
diff --git a/src/persist/persist.c b/src/persist/persist.c
index babf43ff..dd92f601 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 b145e5af..69e37343 100644
--- a/src/persist/persist.h
+++ b/src/persist/persist.h
@@ -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.
  */

From 253f254bd32a232d6c15c5b1def02f3879c90f94 Mon Sep 17 00:00:00 2001
From: eeff <33566201+eeff@users.noreply.github.com>
Date: Wed, 1 Feb 2023 10:48:24 +0800
Subject: [PATCH 2/2] feat: move persister to neuron base

---
 CMakeLists.txt                                       | 12 ++++++------
 .../neuron}/persist/json/persist_json_plugin.h       |  0
 {src => include/neuron}/persist/persist.h            |  2 +-
 src/persist/json/persist_json_plugin.c               |  2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)
 rename {src => include/neuron}/persist/json/persist_json_plugin.h (100%)
 rename {src => include/neuron}/persist/persist.h (99%)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8d0d4a4a..f0aaee1b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -59,6 +59,9 @@ else()
   link_directories(/usr/local/lib)
 endif()
 
+set(PERSIST_SOURCES
+    src/persist/persist.c
+    src/persist/json/persist_json_plugin.c)
 aux_source_directory(src/parser NEURON_SRC_PARSE)
 set(NEURON_BASE_SOURCES
     src/base/tag.c
@@ -74,7 +77,8 @@ set(NEURON_BASE_SOURCES
     src/utils/neu_jwt.c
     src/utils/base64.c
     src/utils/async_queue.c
-    src/utils/mem_cache.c)
+    src/utils/mem_cache.c
+    ${PERSIST_SOURCES})
 
 add_library(neuron-base SHARED)
 target_sources(neuron-base PRIVATE ${NEURON_BASE_SOURCES} ${NEURON_SRC_PARSE}) 
@@ -89,9 +93,6 @@ add_dependencies(neuron-base neuron-version)
 #find_package(MbedTLS)
 target_link_libraries(neuron-base mbedtls mbedx509 mbedcrypto)
 
-set(PERSIST_SOURCES
-    src/persist/persist.c
-    src/persist/json/persist_json_plugin.c)
 set(NEURON_SOURCES
     src/main.c
     src/argparse.c
@@ -123,8 +124,7 @@ set(NEURON_SOURCES
     plugins/restful/proxy.c
     plugins/restful/websocket.c
     plugins/monitor/monitor.c
-    plugins/monitor/metric_handle.c
-    ${PERSIST_SOURCES})
+    plugins/monitor/metric_handle.c)
 
 set(CMAKE_BUILD_RPATH ./)
 add_executable(neuron)
diff --git a/src/persist/json/persist_json_plugin.h b/include/neuron/persist/json/persist_json_plugin.h
similarity index 100%
rename from src/persist/json/persist_json_plugin.h
rename to include/neuron/persist/json/persist_json_plugin.h
diff --git a/src/persist/persist.h b/include/neuron/persist/persist.h
similarity index 99%
rename from src/persist/persist.h
rename to include/neuron/persist/persist.h
index 69e37343..c9661d95 100644
--- a/src/persist/persist.h
+++ b/include/neuron/persist/persist.h
@@ -306,4 +306,4 @@ int neu_persister_delete_user(const char *user_name);
 }
 #endif
 
-#endif
\ No newline at end of file
+#endif
diff --git a/src/persist/json/persist_json_plugin.c b/src/persist/json/persist_json_plugin.c
index 40be1bd3..0c33eea2 100644
--- a/src/persist/json/persist_json_plugin.c
+++ b/src/persist/json/persist_json_plugin.c
@@ -27,7 +27,7 @@
 
 #include "json/json.h"
 
-#include "persist_json_plugin.h"
+#include "persist/json/persist_json_plugin.h"
 
 int neu_json_decode_plugin_req(char *buf, neu_json_plugin_req_t **result)
 {