From a2f9942baac4d08aac0adc278e7f5b9f18c15312 Mon Sep 17 00:00:00 2001 From: Seokho Son Date: Sun, 16 Jun 2024 04:03:03 +0900 Subject: [PATCH] Fix recommend by latency error --- conf/setup.env | 2 +- src/api/rest/server/middlewares/custom-middleware.go | 2 +- src/api/rest/server/server.go | 2 +- src/core/mcis/recommendation.go | 5 +++-- src/main.go | 2 +- 5 files changed, 7 insertions(+), 6 deletions(-) diff --git a/conf/setup.env b/conf/setup.env index 06213b40..da4c55e7 100644 --- a/conf/setup.env +++ b/conf/setup.env @@ -44,7 +44,7 @@ export LOGFILE_MAXSIZE=10 export LOGFILE_MAXBACKUPS=3 export LOGFILE_MAXAGE=30 export LOGFILE_COMPRESS=false -# Set log level, such as trace, debug info, warn, error, fatal, and panic +# Set log level, such as trace, debug, info, warn, error, fatal, and panic export LOGLEVEL=debug # Set log writer, such as file, stdout, or both export LOGWRITER=both diff --git a/src/api/rest/server/middlewares/custom-middleware.go b/src/api/rest/server/middlewares/custom-middleware.go index d0a5e50f..c916a97f 100644 --- a/src/api/rest/server/middlewares/custom-middleware.go +++ b/src/api/rest/server/middlewares/custom-middleware.go @@ -96,7 +96,7 @@ func RequestIdAndDetailsIssuer(next echo.HandlerFunc) echo.HandlerFunc { // Set Request on the context c.Set("RequestID", reqID) - log.Trace().Msgf("(Request ID middleware) Request ID: %s", reqID) + //log.Trace().Msgf("(Request ID middleware) Request ID: %s", reqID) if _, ok := common.RequestMap.Load(reqID); ok { return fmt.Errorf("the X-Request-Id is already in use") } diff --git a/src/api/rest/server/server.go b/src/api/rest/server/server.go index acd23018..4f07a2db 100644 --- a/src/api/rest/server/server.go +++ b/src/api/rest/server/server.go @@ -451,7 +451,7 @@ func RunServer(port string) { fmt.Println(" Default CredentialHolder: " + common.DefaultCredentialHolder + "\n") if enableAuth { - fmt.Println(" Access to API dashboard" + " (username: " + apiUser + " / password: " + apiPass + ")") + fmt.Println(" Access to API dashboard" + " (username: $API_USERNAME / password: $API_PASSWORD)") } fmt.Printf(noticeColor, apidashboard) diff --git a/src/core/mcis/recommendation.go b/src/core/mcis/recommendation.go index b4987434..a31a38f0 100644 --- a/src/core/mcis/recommendation.go +++ b/src/core/mcis/recommendation.go @@ -231,7 +231,7 @@ func RecommendVmLatency(nsId string, specList *[]mcir.TbSpecInfo, param *[]Param for i, k := range *specList { sumLatancy := 0.0 for _, region := range v.Val { - l, _ := GetLatency(region, k.RegionName) + l, _ := GetLatency(region, k.ProviderName+"-"+k.RegionName) sumLatancy += l } @@ -555,10 +555,11 @@ func getDistance(latitude float64, longitude float64, providerName string, regio // GetLatency func get latency between given two regions func GetLatency(src string, dest string) (float64, error) { + latencyString := common.RuntimeLatancyMap[common.RuntimeLatancyMapIndex[src]][common.RuntimeLatancyMapIndex[dest]] latency, err := strconv.ParseFloat(strings.ReplaceAll(latencyString, " ", ""), 32) if err != nil { - log.Error().Err(err).Msg("") + log.Info().Err(err).Msgf("Cannot get GetLatency between src: %v, dest: %v (check assets)", src, dest) return 999999, err } return latency, nil diff --git a/src/main.go b/src/main.go index ef333124..b4981840 100644 --- a/src/main.go +++ b/src/main.go @@ -246,7 +246,7 @@ func setConfig() { log.Error().Err(err).Msg("") panic(err) } - common.PrintCredentialInfo(common.RuntimeCredential) + // common.PrintCredentialInfo(common.RuntimeCredential) } // err = common.RegisterAllCloudInfo()