[#1619] logger: Review

Signed-off-by: Anton Nikiforov <an.nikiforov@yadro.com>

cmd/frostfs-node/config.go

@@ -697,15 +697,19 @@ func initCfg(appCfg *config.Config) *cfg {
 	}
 	initLocalNodeInfo(c, key, netAddr, attrs)
 
-	locodeDB := locodebolt.New(locodebolt.Prm{
-		Path: nodeconfig.LocodeDBPath(appCfg),
-	},
-		locodebolt.ReadOnly(),
-	)
-	err := locodeDB.Open()
-	fatalOnErr(err)
+	var locodeDB *locodebolt.DB
+	locodeDBPath := nodeconfig.LocodeDBPath(appCfg)
+	if len(locodeDBPath) > 0 {
+		locodeDB = locodebolt.New(locodebolt.Prm{
+			Path: locodeDBPath,
+		},
+			locodebolt.ReadOnly(),
+		)
+		err := locodeDB.Open()
+		fatalOnErr(err)
+	}
 
-	err = c.readConfig(appCfg, locodeDB, c.cfgNodeInfo.localInfo)
+	err := c.readConfig(appCfg, locodeDB, c.cfgNodeInfo.localInfo)
 	if err != nil {
 		panic(fmt.Errorf("config reading: %w", err))
 	}

cmd/frostfs-node/config/node/config.go

@@ -40,8 +40,6 @@ const (
 
 	// PersistentStatePathDefault is a default path for persistent state file.
 	PersistentStatePathDefault = ".frostfs-storage-state"
-
-	pathToLocodeDBDefault = "/var/lib/frostfs/locode_db"
 )
 
 // Key returns the  value of "key" config parameter
@@ -222,9 +220,5 @@ func CompatibilityMode(c *config.Config) bool {
 
 // LocodeDBPath returns path to LOCODE database.
 func LocodeDBPath(c *config.Config) string {
-	v := config.String(c.Sub(subsection).Sub("locode"), "db_path")
-	if len(v) == 0 {
-		return pathToLocodeDBDefault
-	}
-	return v
+	return config.String(c.Sub(subsection).Sub("locode"), "db_path")
 }

pkg/services/object_manager/placement/metrics.go

@@ -116,12 +116,14 @@ func getPoint(db *locodebolt.DB, raw string) (*locodedb.Point, error) {
 	return record.GeoPoint(), nil
 }
 
-func distance(lat1 float64, lng1 float64, lat2 float64, lng2 float64) float64 {
-	radlat1 := math.Pi * lat1 / 180
-	radlat2 := math.Pi * lat2 / 180
-	radtheta := math.Pi * (lng1 - lng2) / 180
+// distance return amount of KM between two points.
+// Parameters are latitude and longitude of point 1 and 2 in decimal degrees.
+func distance(lt1 float64, ln1 float64, lt2 float64, ln2 float64) float64 {
+	radLat1 := math.Pi * lt1 / 180
+	radLat2 := math.Pi * lt2 / 180
+	radTheta := math.Pi * (ln1 - ln2) / 180
 
-	dist := math.Sin(radlat1)*math.Sin(radlat2) + math.Cos(radlat1)*math.Cos(radlat2)*math.Cos(radtheta)
+	dist := math.Sin(radLat1)*math.Sin(radLat2) + math.Cos(radLat1)*math.Cos(radLat2)*math.Cos(radTheta)
 
 	if dist > 1 {
 		dist = 1