Merge pull request #83 from webability-go/late-night

patch v1.7.1

README.md

@@ -1496,6 +1496,10 @@ Extras:
 
 # Version Changes Control
 
+v1.7.1 - 2022-07-03
+-----------------------
+- Separation of librarypath and library for all plugins (components, engines and plugins), to have a better control of plugin prexif and version
+
 v1.7.0 - 2022-06-29
 -----------------------
 - global pluginprefix and hostname parameters added to the configuration .json files. Those parameters are needed when you run multiple instances of the xamboo based on the same directory/code, to compile and load all the .so plugins to avoid conflicts ( name as pluginprefix + "-" + hostame + "library.so." + serial )

applications/linker.go

@@ -41,9 +41,9 @@ func Link() {
 				// take path of library
 				path := strings.ReplaceAll(application.Library, ".so", ".go")
 				lib = &compiler.Plugin{
-					SourcePath:  path,
-					PluginPath:  application.Library,
-					PluginVPath: application.Library + ".1",
+					SourcePath:  application.Librarypath + path,
+					PluginPath:  application.Librarypath + config.Config.PluginPrefix + application.Library,
+					PluginVPath: application.Librarypath + config.Config.PluginPrefix + application.Library + ".1",
 					Version:     0, // will be 1 at first compile
 					Messages:    "",
 					Status:      0, // 0 = must compile or/and load (first creation of library)

cms/engines/linker.go

@@ -63,9 +63,9 @@ func Link() {
 			// take path of library
 			path := strings.ReplaceAll(engine.Library, ".so", ".go")
 			lib = &compiler.Plugin{
-				SourcePath:  path,
-				PluginPath:  engine.Library,
-				PluginVPath: engine.Library + ".1",
+				SourcePath:  engine.Librarypath + path,
+				PluginPath:  engine.Librarypath + config.Config.PluginPrefix + engine.Library,
+				PluginVPath: engine.Librarypath + config.Config.PluginPrefix + engine.Library + ".1",
 				Version:     0, // will be 1 at first compile
 				Messages:    "",
 				Status:      0, // 0 = must compile or/and load (first creation of library)

components/linker.go

@@ -95,9 +95,9 @@ func Link() {
 			// take path of library
 			path := strings.ReplaceAll(component.Library, ".so", ".go")
 			lib = &compiler.Plugin{
-				SourcePath:  path,
-				PluginPath:  component.Library,
-				PluginVPath: component.Library + ".1",
+				SourcePath:  component.Librarypath + path,
+				PluginPath:  component.Librarypath + config.Config.PluginPrefix + component.Library,
+				PluginVPath: component.Librarypath + config.Config.PluginPrefix + component.Library + ".1",
 				Version:     0, // will be 1 at first compile
 				Messages:    "",
 				Status:      0, // 0 = must compile or/and load (first creation of library)

config/components.go

@@ -11,9 +11,10 @@ type ComponentList []Component
 type TComponentList []Component
 
 type Component struct {
-	Name    string `json:"name"`
-	Source  string `json:"source"`
-	Library string `json:"library"`
+	Name        string `json:"name"`
+	Source      string `json:"source"`
+	Librarypath string `json:"librarypath"`
+	Library     string `json:"library"`
 	// Status is 0 = nothing new, 1 = new, 2 = changed, 3 = deleted
 	Status int
 }

config/engines.go

@@ -11,9 +11,10 @@ type EngineList []Engine
 type TEngineList []Engine
 
 type Engine struct {
-	Name    string `json:"name"`
-	Source  string `json:"source"`
-	Library string `json:"library"`
+	Name        string `json:"name"`
+	Source      string `json:"source"`
+	Librarypath string `json:"librarypath"`
+	Library     string `json:"library"`
 	// Status is 0 = nothing new, 1 = new, 2 = changed, 3 = deleted
 	Status int
 }

config/hosts.go

@@ -12,9 +12,10 @@ type THostList []Host
 type Plugins []Plugin
 
 type Plugin struct {
-	Name    string
-	Library string
-	Id      string
+	Name        string `json:"name"`
+	Librarypath string `json:"librarypath"`
+	Library     string `json:"library"`
+	Id          string
 }
 
 type Host struct {

xamboo.go

@@ -26,4 +26,4 @@
 package xamboo
 
 // VERSION last oficial published version of the xamboo on github.com
-const VERSION = "1.7.0"
+const VERSION = "1.7.1"