Merge pull request #229 from fisuda/issue/228_print_version_revision

Fix #228 that no version and revision are printed when error level is higher than info
lets-fiware · Jan 29, 2022 · 8021c11 · 8021c11
2 parents 27640aa + 87f2652
commit 8021c11
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,6 @@
 ## NGSI Go v0.10.0-next
 
+-   Fix: Fix issue #228 that no version and revision are printed when error level is higher than info (#229)
 -   Update: Update golang to 1.17.6 (#227)
 -   Hardening: Support version command for Orion-LD (#226)
 -   Update: Update Orion-LD to 1.0.1 (#225)

diff --git a/e2e/cases/1000_common/1001_stderr.test b/e2e/cases/1000_common/1001_stderr.test
@@ -30,7 +30,7 @@
 ngsi --stderr info version --host unknown
 
 ```1
- (git_hash:)
+REGEX(.*)
 Run001 error host: unknown
 ngsiRun005 error host: unknown
 newClient001 error host: unknown

diff --git a/internal/ngsimain/ngsi.go b/internal/ngsimain/ngsi.go
@@ -69,6 +69,9 @@ func Run(args []string, stdin io.Reader, stdout, stderr io.Writer) int {
 	bufStdout := bufio.NewWriter(stdout)
 	ngsi.InitLog(bufStdin, bufStdout, stderr)
 
+	ngsicli.Version = Version
+	ngsicli.Revision = Revision
+
 	Version = fmt.Sprintf("%s (git_hash:%s)", Version, Revision)
 
 	app := NewNgsiApp()