Better error message on unparseable TZ environment variable

johnkerl · Mar 30, 2023 · d51cd89 · d51cd89
1 parent 5f9ac90
commit d51cd89
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 3 deletions.
diff --git a/internal/pkg/lib/time.go b/internal/pkg/lib/time.go
@@ -1,6 +1,7 @@
 package lib
 
 import (
+	"errors"
 	"fmt"
 	"math"
 	"os"
@@ -16,9 +17,12 @@ import (
 // platform this is necessary for *changing* TZ mid-process: e.g.  if a DSL
 // statement does 'ENV["TZ"] = Asia/Istanbul'.
 func SetTZFromEnv() error {
-	location, err := time.LoadLocation(os.Getenv("TZ"))
+	tzenv := os.Getenv("TZ")
+	location, err := time.LoadLocation(tzenv)
 	if err != nil {
-		return err
+		return errors.New(
+			fmt.Sprintf("mlr: TZ environment variable appears malformed: \"%s\"", tzenv),
+		)
 	}
 	time.Local = location
 	return nil

diff --git a/test/cases/dsl-local-date-time-functions/not-a-valid-timezone-2/cmd b/test/cases/dsl-local-date-time-functions/not-a-valid-timezone-2/cmd
@@ -0,0 +1 @@
+mlr --tz .../... -n put -f test/input/sec2localtime-tz.mlr
diff --git a/test/cases/dsl-local-date-time-functions/not-a-valid-timezone-2/experr b/test/cases/dsl-local-date-time-functions/not-a-valid-timezone-2/experr
@@ -0,0 +1 @@
+mlr :  TZ environment variable appears malformed: ".../..."
diff --git a/test/cases/dsl-local-date-time-functions/not-a-valid-timezone-2/expout b/test/cases/dsl-local-date-time-functions/not-a-valid-timezone-2/expout
diff --git a/test/cases/dsl-local-date-time-functions/not-a-valid-timezone-2/should-fail b/test/cases/dsl-local-date-time-functions/not-a-valid-timezone-2/should-fail
diff --git a/test/cases/dsl-local-date-time-functions/not-a-valid-timezone/experr b/test/cases/dsl-local-date-time-functions/not-a-valid-timezone/experr
@@ -1 +1 @@
-${MLR} :  unknown time zone this-is-not-a-valid-timezone-name
+mlr :  TZ environment variable appears malformed: "this-is-not-a-valid-timezone-name"