VOL-3434 Added SCA Fixes
Change-Id: I39dd692119774c4436b32e939d8342ae01ef4dc6
diff --git a/cmd/openonu-adapter/main.go b/cmd/openonu-adapter/main.go
index b472c2e..0b91e79 100644
--- a/cmd/openonu-adapter/main.go
+++ b/cmd/openonu-adapter/main.go
@@ -45,7 +45,7 @@
)
type adapter struct {
- defaultAppName string
+ //defaultAppName string
instanceID string
config *config.AdapterFlags
iAdapter adapters.IAdapter // from Voltha interface adapters
@@ -422,9 +422,8 @@
content, err := ioutil.ReadFile("VERSION")
if err == nil {
return (string(content))
- } else {
- logger.Error("'VERSION'-file not readable")
}
+ logger.Error("'VERSION'-file not readable")
}
return version.VersionInfo.Version
}
@@ -508,17 +507,17 @@
realMain() //fatal on httpListen(0,6060) ...
- defer log.CleanUp()
-
+ defer func() {
+ _ = log.CleanUp()
+ }()
// Print version / build information and exit
if cf.DisplayVersionOnly {
printVersion(defaultAppName)
return
- } else {
- logger.Infow("config", log.Fields{"StartName": defaultAppName})
- logger.Infow("config", log.Fields{"BuildVersion": version.VersionInfo.String(" ")})
- logger.Infow("config", log.Fields{"Arguments": os.Args[1:]})
}
+ logger.Infow("config", log.Fields{"StartName": defaultAppName})
+ logger.Infow("config", log.Fields{"BuildVersion": version.VersionInfo.String(" ")})
+ logger.Infow("config", log.Fields{"Arguments": os.Args[1:]})
// Print banner if specified
if cf.Banner {