feat: move default_plugins.json and sql schemas to config directory

Author: eeff

Diff for: CMakeLists.txt

@@ -131,9 +131,9 @@ file(COPY ${CMAKE_SOURCE_DIR}/dev.conf DESTINATION ${CMAKE_BINARY_DIR}/config)
 file(COPY ${CMAKE_SOURCE_DIR}/.gitkeep DESTINATION ${CMAKE_BINARY_DIR}/logs)
 file(COPY ${CMAKE_SOURCE_DIR}/neuron.key DESTINATION ${CMAKE_BINARY_DIR}/config)
 file(COPY ${CMAKE_SOURCE_DIR}/neuron.pem DESTINATION ${CMAKE_BINARY_DIR}/config)
-file(COPY ${CMAKE_SOURCE_DIR}/persistence DESTINATION ${CMAKE_BINARY_DIR}/)
-file(COPY ${CMAKE_SOURCE_DIR}/default_plugins.json DESTINATION ${CMAKE_BINARY_DIR}/persistence)
-file(RENAME ${CMAKE_BINARY_DIR}/persistence/default_plugins.json ${CMAKE_BINARY_DIR}/persistence/plugins.json)
+file(GLOB SQL_SCHEMAS ${CMAKE_SOURCE_DIR}/persistence/*.sql)
+file(COPY ${SQL_SCHEMAS} DESTINATION ${CMAKE_BINARY_DIR}/config)
+file(COPY ${CMAKE_SOURCE_DIR}/default_plugins.json DESTINATION ${CMAKE_BINARY_DIR}/config)
 
 add_subdirectory(plugins/modbus)
 add_subdirectory(plugins/mqtt)

Diff for: ft/Keyword/Neuron.py

@@ -8,8 +8,6 @@
 
 def prepare_persistence_dir():
     os.system("mkdir -p build/persistence")
-    os.system("cp -r persistence build/")
-    os.system("cp default_plugins.json build/persistence/plugins.json")
 
 
 class Neuron(object):

Diff for: package-sdk.sh

@@ -46,7 +46,7 @@ cp build/neuron ${package_name}
 cp build/libneuron-base.so ${package_name}/lib
 cp zlog/src/libzlog.so.1.2 ${package_name}/lib
 
-cp -r persistence ${package_name}/
+cp persistence/*.sql ${package_name}/config/
 cp migrate.py ${package_name}/
 
 cp sdk-zlog.conf ${package_name}/config/

Diff for: sdk-install.sh

@@ -27,9 +27,9 @@ cp config/sdk-zlog.conf ${neuron_bin}/config/zlog.conf
 cp config/dev.conf ${neuron_bin}/config/
 cp config/neuron.key ${neuron_bin}/config/
 cp config/neuron.pem ${neuron_bin}/config/
+cp config/default_plugins.json ${neuron_bin}/config/
+cp config/*.sql ${neuron_bin}/config/
 
-cp config/default_plugins.json ${neuron_bin}/persistence/plugins.json
-cp persistence/* ${neuron_bin}/persistence/
 cp -r plugins/* ${neuron_bin}/plugins/
 
 cp -r dist ${neuron_bin}/

Diff for: src/persist/persist.c

@@ -616,7 +616,7 @@ neu_persister_t *neu_persister_create(const char *dir_name)
         sqlite3_close(persister->db);
         goto error;
     }
-    if (0 != apply_schemas(persister->db, persister->persist_dir)) {
+    if (0 != apply_schemas(persister->db, "config/")) {
         goto error;
     }
 
@@ -780,6 +780,10 @@ int neu_persister_store_plugins(neu_persister_t *persister,
 
     utarray_foreach(plugin_infos, neu_resp_plugin_info_t *, plugin)
     {
+        if (NEU_PLUGIN_KIND_SYSTEM == plugin->kind) {
+            // filter out system plugins
+            continue;
+        }
         plugin_resp.plugins[index] = plugin->library;
         index++;
     }
@@ -799,11 +803,10 @@ int neu_persister_store_plugins(neu_persister_t *persister,
     return rv;
 }
 
-int neu_persister_load_plugins(neu_persister_t *persister,
-                               UT_array **      plugin_infos)
+static int load_plugins_file(const char *fname, UT_array *plugin_infos)
 {
     char *json_str = NULL;
-    int   rv       = read_file_string(persister->plugins_fname, &json_str);
+    int   rv       = read_file_string(fname, &json_str);
     if (rv != 0) {
         return rv;
     }
@@ -815,10 +818,9 @@ int neu_persister_load_plugins(neu_persister_t *persister,
         return rv;
     }
 
-    utarray_new(*plugin_infos, &ut_ptr_icd);
     for (int i = 0; i < plugin_req->n_plugin; i++) {
         char *name = plugin_req->plugins[i];
-        utarray_push_back(*plugin_infos, &name);
+        utarray_push_back(plugin_infos, &name);
     }
 
     free(json_str);
@@ -827,6 +829,21 @@ int neu_persister_load_plugins(neu_persister_t *persister,
     return 0;
 }
 
+int neu_persister_load_plugins(neu_persister_t *persister,
+                               UT_array **      plugin_infos)
+{
+    utarray_new(*plugin_infos, &ut_ptr_icd);
+    // default plugins will always present
+    if (0 != load_plugins_file("config/default_plugins.json", *plugin_infos)) {
+        nlog_warn("cannot load default plugins");
+    }
+    // user plugins
+    if (0 != load_plugins_file(persister->plugins_fname, *plugin_infos)) {
+        nlog_warn("cannot load user plugins");
+    }
+    return 0;
+}
+
 int neu_persister_store_tag(neu_persister_t *persister, const char *driver_name,
                             const char *group_name, const neu_datatag_t *tag)
 {