Skip to content
Snippets Groups Projects
Verified Commit 3f09dc49 authored by Volker Schukai's avatar Volker Schukai :alien:
Browse files

chore: commit save point

parent b9cd4bb0
No related branches found
No related tags found
No related merge requests found
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<configuration default="false" name="server serve" type="GoApplicationRunConfiguration" factoryName="Go Application"> <configuration default="false" name="server serve" type="GoApplicationRunConfiguration" factoryName="Go Application">
<module name="conan" /> <module name="conan" />
<working_directory value="$PROJECT_DIR$/development/examples/e1" /> <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" /> <kind value="DIRECTORY" />
<directory value="$PROJECT_DIR$/application/source" /> <directory value="$PROJECT_DIR$/application/source" />
<filePath value="$PROJECT_DIR$/application/source/main.go" /> <filePath value="$PROJECT_DIR$/application/source/main.go" />
......
...@@ -9,7 +9,7 @@ The files can be found [here](http://download.schukai.com/tools/conan/). ...@@ -9,7 +9,7 @@ The files can be found [here](http://download.schukai.com/tools/conan/).
```bash ```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. ## For Linux, the execution bit must still be set.
chmod u+x ~/.local/bin/conan chmod u+x ~/.local/bin/conan
``` ```
......
package configuration package configuration
type Settings map[string]interface{} type Settings map[string]interface{}
type ClientAddress *Client
type Client struct { //type ClientAddress *Client
Endpoints struct {
Messages string `env:"CLIENT_ENDPOINT_MESSAGES,default=/messages" yaml:"Messages" json:"Messages"` //type Client struct {
} `yaml:"Endpoints" json:"Endpoints"` // Endpoints struct {
Settings `yaml:"Settings" json:"Settings"` // Messages string `env:"CLIENT_ENDPOINT_MESSAGES,default=/messages" yaml:"Messages" json:"Messages"`
} // } `yaml:"Endpoints" json:"Endpoints"`
// Settings `yaml:"Settings" json:"Settings"`
//}
type Watch struct { type Watch struct {
Path string `yaml:"Path" json:"Path"` Path string `yaml:"Path" json:"Path"`
...@@ -35,6 +36,5 @@ type ConfigStruct struct { ...@@ -35,6 +36,5 @@ type ConfigStruct struct {
} `yaml:"Flags"` } `yaml:"Flags"`
Watch []Watch `yaml:"Watch"` Watch []Watch `yaml:"Watch"`
} `yaml:"Server"` } `yaml:"Server"`
// Client Client `yaml:"Client" json:"Client"`
Client Client `yaml:"Client" json:"Client"`
} }
...@@ -2,7 +2,6 @@ package configuration ...@@ -2,7 +2,6 @@ package configuration
import ( import (
error2 "gitlab.schukai.com/oss/utilities/conan/error" error2 "gitlab.schukai.com/oss/utilities/conan/error"
"net/url"
"strconv" "strconv"
) )
...@@ -22,15 +21,16 @@ func GetServerLoglevel() string { ...@@ -22,15 +21,16 @@ func GetServerLoglevel() string {
return configurationInstance.Server.Logging.Level return configurationInstance.Server.Logging.Level
} }
func GetClientMessagesEndpointPath() string { //
u, err := url.ParseRequestURI(configurationInstance.Client.Endpoints.Messages) //func GetClientMessagesEndpointPath() string {
error2.CheckError(err) // u, err := url.ParseRequestURI(configurationInstance.Client.Endpoints.Messages)
return u.Path // error2.CheckError(err)
} // return u.Path
//}
func GetClientMessagesEndpoint() string { //
return configurationInstance.Client.Endpoints.Messages //func GetClientMessagesEndpoint() string {
} // return configurationInstance.Client.Endpoints.Messages
//}
func SetServerPort(port string) { func SetServerPort(port string) {
......
...@@ -18,23 +18,23 @@ var configurationPath string ...@@ -18,23 +18,23 @@ var configurationPath string
func init() { func init() {
configurationInstance = &ConfigStruct{} configurationInstance = &ConfigStruct{}
configurationInstance.Client = NewClient() // configurationInstance.Client = NewClient()
} }
func NewClient() Client { //func NewClient() Client {
c := Client{} // c := Client{}
c.Settings = Settings{} // c.Settings = Settings{}
return c // return c
} //}
func GetConfiguration() *ConfigStruct { func GetConfiguration() *ConfigStruct {
return configurationInstance return configurationInstance
} }
func GetDefaultClientConfiguration() Client { //func GetDefaultClientConfiguration() Client {
return configurationInstance.Client // return configurationInstance.Client
} //}
func InitConfiguration(cfgPath, mnemonic string) { func InitConfiguration(cfgPath, mnemonic string) {
......
package configuration package configuration
import ( import (
error2 "gitlab.schukai.com/oss/utilities/conan/error"
"net/url"
"path" "path"
"strconv" "strconv"
) )
func sanitizeMessageEndpoint() { func sanitizeMessageEndpoint() {
e := configurationInstance.Client.Endpoints.Messages //e := configurationInstance.Client.Endpoints.Messages
u, err := url.ParseRequestURI(e) //u, err := url.ParseRequestURI(e)
error2.CheckError(err) //error2.CheckError(err)
//
if u.Scheme != "ws" { //if u.Scheme != "ws" {
u.Scheme = "ws" // u.Scheme = "ws"
} //}
//
if u.Host == "" { //if u.Host == "" {
//
u.Host = configurationInstance.Server.Host // u.Host = configurationInstance.Server.Host
if u.Host == "" { // if u.Host == "" {
error2.PrintErrorAndExit("Host not set") // error2.PrintErrorAndExit("Host not set")
} // }
} //}
configurationInstance.Client.Endpoints.Messages = u.String() //configurationInstance.Client.Endpoints.Messages = u.String()
} }
...@@ -65,5 +63,5 @@ func sanitizeWatch() { ...@@ -65,5 +63,5 @@ func sanitizeWatch() {
func sanitize() { func sanitize() {
sanitizeSerer() sanitizeSerer()
sanitizeWatch() sanitizeWatch()
sanitizeMessageEndpoint() //sanitizeMessageEndpoint()
} }
{"version":"0.1.36"} {"version":"0.1.38"}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment