diff --git a/plugins/example-storage-plugin/config.json5 b/plugins/example-storage-plugin/config.json5 new file mode 100644 index 0000000000..9e26dfeeb6 --- /dev/null +++ b/plugins/example-storage-plugin/config.json5 @@ -0,0 +1 @@ +{} \ No newline at end of file diff --git a/plugins/zenoh-plugin-storage-manager/config.json5 b/plugins/zenoh-plugin-storage-manager/config.json5 index 204fa27e96..712cc2a513 100644 --- a/plugins/zenoh-plugin-storage-manager/config.json5 +++ b/plugins/zenoh-plugin-storage-manager/config.json5 @@ -1,16 +1,9 @@ { "volumes": { - "example" : { - "__path__": "./plugins/example-storage-plugin/target/debug/libexample_storage_plugin.dylib", + "example": { + "__path__": "target/debug/libzenoh_backend_example.so", + "__config__": "../../plugins/example-storage-plugin/config.json5" } - //"influxdb_local": { - // "__path__": "../zenoh-backend-influxdb/target/debug/libzenoh_backend_influxdb.dylib", - // "__config__": "config_influxdb_local.json5" - //}, - //"influxdb_remote": { - // "__path__": "../zenoh-backend-influxdb/target/debug/libzenoh_backend_influxdb.dylib", - // "__config__": "config_influxdb_remote.json5" - //} }, "storages": {} } \ No newline at end of file diff --git a/plugins/zenoh-plugin-storage-manager/config_influxdb_local.json5 b/plugins/zenoh-plugin-storage-manager/config_influxdb_local.json5 deleted file mode 100644 index b627f9eb89..0000000000 --- a/plugins/zenoh-plugin-storage-manager/config_influxdb_local.json5 +++ /dev/null @@ -1,7 +0,0 @@ -{ - url: "https://localhost:8086", - private: { - username: "user1", - password: "pw1", - }, -} \ No newline at end of file diff --git a/plugins/zenoh-plugin-storage-manager/config_influxdb_remote.json5 b/plugins/zenoh-plugin-storage-manager/config_influxdb_remote.json5 deleted file mode 100644 index b034b4c77a..0000000000 --- a/plugins/zenoh-plugin-storage-manager/config_influxdb_remote.json5 +++ /dev/null @@ -1,7 +0,0 @@ -{ - url: "https://myinfluxdb.example", - private: { - username: "user1", - password: "pw1", - }, -} \ No newline at end of file diff --git a/plugins/zenoh-plugin-storage-manager/src/lib.rs b/plugins/zenoh-plugin-storage-manager/src/lib.rs index 54eb78f95d..613eae97d0 100644 --- a/plugins/zenoh-plugin-storage-manager/src/lib.rs +++ b/plugins/zenoh-plugin-storage-manager/src/lib.rs @@ -170,13 +170,12 @@ impl StorageRuntimeInner { for path in paths { unsafe { if let Ok((lib, path)) = LibLoader::load_file(path) { - self.loaded_backend_from_lib( + return self.loaded_backend_from_lib( &volume_id, config.clone(), lib, path, - )?; - break; + ); } } }