diff --git a/.idea/runConfigurations/server_serve.xml b/.idea/runConfigurations/server_serve.xml index 1aec31652079bc2554541315364b75fc61985c5f..33ef7dfb01c4cbe3fb64a733d711f0dae9b2d893 100644 --- a/.idea/runConfigurations/server_serve.xml +++ b/.idea/runConfigurations/server_serve.xml @@ -2,7 +2,7 @@ <configuration default="false" name="server serve" type="GoApplicationRunConfiguration" factoryName="Go Application"> <module name="conan" /> <working_directory value="$PROJECT_DIR$/development/examples/e1" /> - <parameters value="--config=development/examples/e1/config.yaml server serve" /> + <parameters value="--config=development/examples/e1/config.yaml server serve --pid-file=/tmp/conan.pid" /> <kind value="DIRECTORY" /> <directory value="$PROJECT_DIR$/application/source" /> <filePath value="$PROJECT_DIR$/application/source/main.go" /> diff --git a/README.md b/README.md index 97f090ebcc5184afb6e6bdc5d664b3d70f233fca..d4f90e5be64a1e828f2d18b5309a72a96e457549 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ The files can be found [here](http://download.schukai.com/tools/conan/). ```bash -wget -O ~/.local/bin/conan http://download.schukai.com/tools/conan/conan-linux-amd64 +wget -O ~/.local/bin/conan http://download.schukai.com/tools/conan/conan-$( uname -s | tr [:upper:] [:lower:])-$(echo `uname -m | sed s/aarch64/arm64/ | sed s/x86_64/amd64/`) ## For Linux, the execution bit must still be set. chmod u+x ~/.local/bin/conan ``` @@ -51,7 +51,7 @@ Server: Flags: FollowSymlinks: true - + ``` diff --git a/application/source/configuration/definition.go b/application/source/configuration/definition.go index 9c9dfc7d4bd4e55e0e024e2e27cddf8612191446..679754b96cc32e87d2e527d57f9db1573e433676 100644 --- a/application/source/configuration/definition.go +++ b/application/source/configuration/definition.go @@ -1,14 +1,15 @@ package configuration type Settings map[string]interface{} -type ClientAddress *Client -type Client struct { - Endpoints struct { - Messages string `env:"CLIENT_ENDPOINT_MESSAGES,default=/messages" yaml:"Messages" json:"Messages"` - } `yaml:"Endpoints" json:"Endpoints"` - Settings `yaml:"Settings" json:"Settings"` -} +//type ClientAddress *Client + +//type Client struct { +// Endpoints struct { +// Messages string `env:"CLIENT_ENDPOINT_MESSAGES,default=/messages" yaml:"Messages" json:"Messages"` +// } `yaml:"Endpoints" json:"Endpoints"` +// Settings `yaml:"Settings" json:"Settings"` +//} type Watch struct { Path string `yaml:"Path" json:"Path"` @@ -35,6 +36,5 @@ type ConfigStruct struct { } `yaml:"Flags"` Watch []Watch `yaml:"Watch"` } `yaml:"Server"` - - Client Client `yaml:"Client" json:"Client"` + // Client Client `yaml:"Client" json:"Client"` } diff --git a/application/source/configuration/getter-setter.go b/application/source/configuration/getter-setter.go index 76017e7b8de6a5b1b99f7cf31ab64de43c0e8184..39a87a2bb95c313c5dbd19684549fea0a26a4287 100644 --- a/application/source/configuration/getter-setter.go +++ b/application/source/configuration/getter-setter.go @@ -2,7 +2,6 @@ package configuration import ( error2 "gitlab.schukai.com/oss/utilities/conan/error" - "net/url" "strconv" ) @@ -22,15 +21,16 @@ func GetServerLoglevel() string { return configurationInstance.Server.Logging.Level } -func GetClientMessagesEndpointPath() string { - u, err := url.ParseRequestURI(configurationInstance.Client.Endpoints.Messages) - error2.CheckError(err) - return u.Path -} - -func GetClientMessagesEndpoint() string { - return configurationInstance.Client.Endpoints.Messages -} +// +//func GetClientMessagesEndpointPath() string { +// u, err := url.ParseRequestURI(configurationInstance.Client.Endpoints.Messages) +// error2.CheckError(err) +// return u.Path +//} +// +//func GetClientMessagesEndpoint() string { +// return configurationInstance.Client.Endpoints.Messages +//} func SetServerPort(port string) { diff --git a/application/source/configuration/init.go b/application/source/configuration/init.go index 518975bf739f1b40d6c919d307cc42e85b66f690..2543214b3f0a27d3f4bb2cfd8fe12ec708ef7af2 100644 --- a/application/source/configuration/init.go +++ b/application/source/configuration/init.go @@ -18,23 +18,23 @@ var configurationPath string func init() { configurationInstance = &ConfigStruct{} - configurationInstance.Client = NewClient() + // configurationInstance.Client = NewClient() } -func NewClient() Client { - c := Client{} - c.Settings = Settings{} - return c -} +//func NewClient() Client { +// c := Client{} +// c.Settings = Settings{} +// return c +//} func GetConfiguration() *ConfigStruct { return configurationInstance } -func GetDefaultClientConfiguration() Client { - return configurationInstance.Client -} +//func GetDefaultClientConfiguration() Client { +// return configurationInstance.Client +//} func InitConfiguration(cfgPath, mnemonic string) { diff --git a/application/source/configuration/sanitize.go b/application/source/configuration/sanitize.go index 4ad00d8afd1cab491b27626e168c83efaf59ced9..81e68e5fb26a12e4adcb3509b6ea9469197ebeaf 100644 --- a/application/source/configuration/sanitize.go +++ b/application/source/configuration/sanitize.go @@ -1,31 +1,29 @@ package configuration import ( - error2 "gitlab.schukai.com/oss/utilities/conan/error" - "net/url" "path" "strconv" ) func sanitizeMessageEndpoint() { - e := configurationInstance.Client.Endpoints.Messages - - u, err := url.ParseRequestURI(e) - error2.CheckError(err) - - if u.Scheme != "ws" { - u.Scheme = "ws" - } - - if u.Host == "" { - - u.Host = configurationInstance.Server.Host - if u.Host == "" { - error2.PrintErrorAndExit("Host not set") - } - } - - configurationInstance.Client.Endpoints.Messages = u.String() + //e := configurationInstance.Client.Endpoints.Messages + + //u, err := url.ParseRequestURI(e) + //error2.CheckError(err) + // + //if u.Scheme != "ws" { + // u.Scheme = "ws" + //} + // + //if u.Host == "" { + // + // u.Host = configurationInstance.Server.Host + // if u.Host == "" { + // error2.PrintErrorAndExit("Host not set") + // } + //} + + //configurationInstance.Client.Endpoints.Messages = u.String() } @@ -65,5 +63,5 @@ func sanitizeWatch() { func sanitize() { sanitizeSerer() sanitizeWatch() - sanitizeMessageEndpoint() + //sanitizeMessageEndpoint() } diff --git a/release.json b/release.json index aa9d8f26cc2eb1f4a5ab5dd80f961f80edce3bf9..66788cb595ac79960aab21b54aaab64ecb1b0992 100644 --- a/release.json +++ b/release.json @@ -1 +1 @@ -{"version":"0.1.36"} +{"version":"0.1.38"}