Other: Bridge HZM 1.6.9

Changelog.md

@@ -2,6 +2,24 @@
 
 Changelog [format](http://keepachangelog.com/en/1.0.0/)
 
+## [Bridge 1.6.9] HZM
+
+### Fixed
+* GODT-1121 'Keep the application up to date' switches off after restarting Bridge.
+
+
+## [Bridge 1.6.8] HZM
+
+### Fixed
+* GODT-1120 Use Info level in internal/app logs.
+
+
+## [IE 1.3.3] Farg
+
+### Fixed
+* GODT-1120 Use Info level in internal/app logs.
+
+
 ## [Bridge 1.6.7] HZM
 
 ### Added

Makefile

@@ -10,8 +10,8 @@ TARGET_OS?=${GOOS}
 .PHONY: build build-ie build-nogui build-ie-nogui build-launcher build-launcher-ie  versioner hasher
 
 # Keep version hardcoded so app build works also without Git repository.
-BRIDGE_APP_VERSION?=1.6.7+git
-IE_APP_VERSION?=1.3.2+git
+BRIDGE_APP_VERSION?=1.6.9+git
+IE_APP_VERSION?=1.3.3+git
 APP_VERSION:=${BRIDGE_APP_VERSION}
 SRC_ICO:=logo.ico
 SRC_ICNS:=Bridge.icns
@@ -354,4 +354,4 @@ generate:
 	go generate ./...
 	$(MAKE) add-license
 
-.FORCE:
+.FORCE:

internal/app/base/base.go

@@ -136,7 +136,6 @@ func New( // nolint[funlen]
 	if err := logging.Init(logsPath); err != nil {
 		return nil, err
 	}
-	logging.SetLevel("debug") // Proper level is set later in run.
 	crashHandler.AddRecoveryAction(logging.DumpStackTrace(logsPath))
 
 	if err := migrateFiles(configName); err != nil {

internal/app/base/migration.go

@@ -111,7 +111,7 @@ func moveIfExists(source, destination string) error {
 	l := logrus.WithField("source", source).WithField("destination", destination)
 
 	if _, err := os.Stat(source); os.IsNotExist(err) {
-		l.Debug("No need to migrate file, source doesn't exist")
+		l.Info("No need to migrate file, source doesn't exist")
 		return nil
 	}
 

internal/app/bridge/bridge.go

@@ -189,9 +189,10 @@ func generateTLSCerts(b *base.Base) error {
 }
 
 func checkAndHandleUpdate(u types.Updater, f frontend.Frontend, autoUpdate bool) {
+	log := logrus.WithField("pkg", "app/bridge")
 	version, err := u.Check()
 	if err != nil {
-		logrus.WithError(err).Error("An error occurred while checking for updates")
+		log.WithError(err).Error("An error occurred while checking for updates")
 		return
 	}
 
@@ -201,11 +202,11 @@ func checkAndHandleUpdate(u types.Updater, f frontend.Frontend, autoUpdate bool)
 	f.SetVersion(version)
 
 	if !u.IsUpdateApplicable(version) {
-		logrus.Debug("No need to update")
+		log.Info("No need to update")
 		return
 	}
 
-	logrus.WithField("version", version.Version).Info("An update is available")
+	log.WithField("version", version.Version).Info("An update is available")
 
 	if !autoUpdate {
 		f.NotifyManualUpdate(version, u.CanInstall(version))
@@ -213,16 +214,16 @@ func checkAndHandleUpdate(u types.Updater, f frontend.Frontend, autoUpdate bool)
 	}
 
 	if !u.CanInstall(version) {
-		logrus.Info("A manual update is required")
+		log.Info("A manual update is required")
 		f.NotifySilentUpdateError(updater.ErrManualUpdateRequired)
 		return
 	}
 
 	if err := u.InstallUpdate(version); err != nil {
 		if errors.Cause(err) == updater.ErrDownloadVerify {
-			logrus.WithError(err).Warning("Skipping update installation due to temporary error")
+			log.WithError(err).Warning("Skipping update installation due to temporary error")
 		} else {
-			logrus.WithError(err).Error("The update couldn't be installed")
+			log.WithError(err).Error("The update couldn't be installed")
 			f.NotifySilentUpdateError(err)
 		}
 

internal/app/ie/ie.go

@@ -87,9 +87,10 @@ func run(b *base.Base, c *cli.Context) error {
 }
 
 func checkAndHandleUpdate(u types.Updater, f frontend.Frontend, autoUpdate bool) { //nolint[unparam]
+	log := logrus.WithField("pkg", "app/ie")
 	version, err := u.Check()
 	if err != nil {
-		logrus.WithError(err).Error("An error occurred while checking for updates")
+		log.WithError(err).Error("An error occurred while checking for updates")
 		return
 	}
 
@@ -99,11 +100,11 @@ func checkAndHandleUpdate(u types.Updater, f frontend.Frontend, autoUpdate bool)
 	f.SetVersion(version)
 
 	if !u.IsUpdateApplicable(version) {
-		logrus.Debug("No need to update")
+		log.Info("No need to update")
 		return
 	}
 
-	logrus.WithField("version", version.Version).Info("An update is available")
+	log.WithField("version", version.Version).Info("An update is available")
 
 	f.NotifyManualUpdate(version, u.CanInstall(version))
 }

internal/frontend/qt/frontend.go

@@ -370,24 +370,15 @@ func (s *FrontendQt) qtExecute(Procedure func(*FrontendQt) error) error {
 	}
 	s.Qml.SetIsAutoStart(s.autostart.IsEnabled())
 
-	if s.settings.GetBool(settings.AllowProxyKey) {
-		s.Qml.SetIsProxyAllowed(true)
-	} else {
-		s.Qml.SetIsProxyAllowed(false)
-	}
-
-	if updater.UpdateChannel(s.settings.Get(settings.UpdateChannelKey)) == updater.EarlyChannel {
-		s.Qml.SetIsEarlyAccess(true)
-	} else {
-		s.Qml.SetIsEarlyAccess(false)
-	}
+	s.Qml.SetIsAutoUpdate(s.settings.GetBool(settings.AutoUpdateKey))
+	s.Qml.SetIsProxyAllowed(s.settings.GetBool(settings.AllowProxyKey))
+	s.Qml.SetIsEarlyAccess(updater.UpdateChannel(s.settings.Get(settings.UpdateChannelKey)) == updater.EarlyChannel)
 
 	availableKeychain := []string{}
 	for chain := range keychain.Helpers {
 		availableKeychain = append(availableKeychain, chain)
 	}
 	s.Qml.SetAvailableKeychain(availableKeychain)
-
 	s.Qml.SetSelectedKeychain(s.settings.Get(settings.PreferredKeychainKey))
 
 	// Set reporting of outgoing email without encryption.

internal/logging/logging.go

@@ -69,6 +69,10 @@ func Init(logsPath string) error {
 	return nil
 }
 
+// SetLevel will change the level of logging and in case of Debug or Trace
+// level it will also prevent from writing to file. Setting level to Info or
+// higher will not set writing to file again if it was previously cancelled by
+// Debug or Trace.
 func SetLevel(level string) {
 	if lvl, err := logrus.ParseLevel(level); err == nil {
 		logrus.SetLevel(lvl)