Mirrors/VILLASweb-backend-go
1
0
Fork 0
mirror of https://git.rwth-aachen.de/acs/public/villas/web-backend-go/ synced 2025-03-30 00:00:12 +01:00
Code Issues Releases Wiki Activity

get rid of ConfigureBackend

Browse source
This commit is contained in:
Steffen Vogel 2021-02-05 19:31:35 +01:00
parent 4943aa9989
commit 00989a7725
3 changed files with 29 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
configuration/config.go
View file

@ -160,30 +160,3 @@ func InitConfig() error {
return nil return nil
} }
func ConfigureBackend() (string, string, string, string, string, error) {
err := InitConfig()
if err != nil {
log.Printf("Error during initialization of global configuration: %v, aborting.", err.Error())
return "", "", "", "", "", err
}
mode, err := GlobalConfig.String("mode")
if err != nil {
log.Printf("Error reading mode from global configuration: %v, aborting.", err.Error())
return "", "", "", "", "", err
}
port, err := GlobalConfig.String("port")
if err != nil {
log.Printf("Error reading port from global configuration: %v, aborting.", err.Error())
return "", "", "", "", "", err
}
AMQPhost, _ := GlobalConfig.String("amqp.host")
AMQPuser, _ := GlobalConfig.String("amqp.user")
AMQPpass, _ := GlobalConfig.String("amqp.pass")
return mode, port, AMQPhost, AMQPuser, AMQPpass, nil
}

2
routes/register.go
View file

@ -145,6 +145,8 @@ func AddTestData(cfg *config.Config, router *gin.Engine) (*bytes.Buffer, error)
return nil, err return nil, err
} }
basePath := "/api/v2"
// add users // add users
for _, u := range GlobalTestData.Users { for _, u := range GlobalTestData.Users {
code, resp, err := helper.TestEndpoint(router, token, basePath+"/users", "POST", helper.KeyModels{"user": u}) code, resp, err := helper.TestEndpoint(router, token, basePath+"/users", "POST", helper.KeyModels{"user": u})

40
start.go
View file

@ -82,43 +82,57 @@ func addData(router *gin.Engine, cfg *config.Config) error {
func main() { func main() {
log.Println("Starting VILLASweb-backend-go") log.Println("Starting VILLASweb-backend-go")
mode, port, amqphost, amqpuser, amqppass, err := configuration.ConfigureBackend() err := configuration.InitConfig()
if err != nil { if err != nil {
panic(err) log.Fatalf("Error during initialization of global configuration: %s, aborting.", err)
} }
//init database mode, err := configuration.GlobalConfig.String("mode")
if err != nil {
log.Fatalf("Error reading mode from global configuration: %s, aborting.", err)
}
port, err := configuration.GlobalConfig.String("port")
if err != nil {
log.Fatalf("Error reading port from global configuration: %s, aborting.", err)
}
// Init database
err = database.InitDB(configuration.GlobalConfig) err = database.InitDB(configuration.GlobalConfig)
if err != nil { if err != nil {
log.Printf("Error during initialization of database: %v, aborting.", err.Error()) log.Fatalf("Error during initialization of database: %s, aborting.", err)
panic(err)
} }
defer database.DBpool.Close() defer database.DBpool.Close()
// init endpoints // Init endpoints
if mode == "release" { if mode == "release" {
gin.SetMode(gin.ReleaseMode) gin.SetMode(gin.ReleaseMode)
} }
r := gin.Default() r := gin.Default()
api := r.Group("/api/v2") api := r.Group("/api/v2")
routes.RegisterEndpoints(r, api) routes.RegisterEndpoints(r, api)
//Start AMQP client // Start AMQP client
if amqphost != "" { AMQPhost, _ := configuration.GlobalConfig.String("amqp.host")
AMQPuser, _ := configuration.GlobalConfig.String("amqp.user")
AMQPpass, _ := configuration.GlobalConfig.String("amqp.pass")
if AMQPhost != "" {
// create amqp URL based on username, password and host // create amqp URL based on username, password and host
amqpurl := "amqp://" + amqpuser + ":" + amqppass + "@" + amqphost amqpurl := "amqp://" + AMQPuser + ":" + AMQPpass + "@" + AMQPhost
err = infrastructure_component.StartAMQP(amqpurl, api) err = infrastructure_component.StartAMQP(amqpurl, api)
if err != nil { if err != nil {
panic(err) log.Fatal(err)
} }
} }
// add data to DB (if any) // Add data to DB (if any)
err = addData(r, configuration.GlobalConfig) err = addData(r, configuration.GlobalConfig)
if err != nil { if err != nil {
panic(err) log.Fatal(err)
} }
// server at port 4000 to match frontend's redirect path // Server at port 4000 to match frontend's redirect path
r.Run(":" + port) r.Run(":" + port)
} }