again reworked version string

Author: nix

doc/ETCD-structure.md

@@ -99,7 +99,7 @@ without interrupting service while adjusting the entries.
 
 The program's data version is given in the release notes and also in the version string logged at program start.
 The full version string ("release version") is `<program version>+<data version>` (with a literal `+`).
-The `<program version>` is appended by a detailed git version string, if it is not a tagged release.
+The default version string is appended by a detailed git version string, if it differs from the release tag.
 
 #### Syntax and rules
 

src/pdns-etcd3.go

@@ -237,11 +237,10 @@ func Main(gitVersion string) {
 	// TODO handle arguments, f.e. 'show-defaults' standalone command
 	log.SetPrefix(fmt.Sprintf("pdns-etcd3[%d]: ", os.Getpid()))
 	log.SetFlags(0)
-	releaseVersion := programVersion.String()
+	releaseVersion := programVersion.String() + "+" + dataVersion.String()
 	if "v"+releaseVersion != gitVersion {
 		releaseVersion += fmt.Sprintf("[%s]", gitVersion)
 	}
-	releaseVersion += fmt.Sprintf("+%s", &dataVersion)
 	log.Printf("pdns-etcd3 %s, Copyright © 2016-2022 nix <https://keybase.io/nixn>", releaseVersion)
 	var logMessages []string
 	reqChan := startReadRequests()