qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-09-30 19:48:33 -06:00
Code Releases Activity

time: return informative errors when failing to load timezone data.

Browse Source 
If we cannot load timezone information for a reason other than the
zoneinfo file not existing, return it since that will be much more
useful in debugging failures than "unknown time zone XYZ".

Fixes #9723.

Change-Id: I3aa5774859cec28e584d16bcc1fef0705d95288c
Reviewed-on: https://go-review.googlesource.com/3984
Reviewed-by: Ian Lance Taylor <iant@golang.org>
This commit is contained in:
David Symonds 2015-02-06 16:58:07 +11:00
parent a35181ba7f
commit 8bf13838eb
4 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/time/sys_unix.go
View File

@ -74,3 +74,5 @@ func preadn(fd uintptr, buf []byte, off int) error {
} }
return nil return nil
} }
func isNotExist(err error) bool { return err == syscall.ENOENT }

9
src/time/zoneinfo_plan9.go
View File

@ -148,11 +148,12 @@ func initLocal() {
} }
func loadLocation(name string) (*Location, error) { func loadLocation(name string) (*Location, error) {
if z, err := loadZoneFile(runtime.GOROOT()+"/lib/time/zoneinfo.zip", name); err == nil { z, err := loadZoneFile(runtime.GOROOT()+"/lib/time/zoneinfo.zip", name)
z.name = name if err != nil {
return z, nil return nil, err
} }
return nil, errors.New("unknown time zone " + name) z.name = name
return z, nil
} }
func forceZipFileForTesting(zipOnly bool) { func forceZipFileForTesting(zipOnly bool) {

6
src/time/zoneinfo_unix.go
View File

@ -74,11 +74,17 @@ func initLocal() {
} }
func loadLocation(name string) (*Location, error) { func loadLocation(name string) (*Location, error) {
var firstErr error
for _, zoneDir := range zoneDirs { for _, zoneDir := range zoneDirs {
if z, err := loadZoneFile(zoneDir, name); err == nil { if z, err := loadZoneFile(zoneDir, name); err == nil {
z.name = name z.name = name
return z, nil return z, nil
} else if firstErr == nil && !isNotExist(err) {
firstErr = err
} }
} }
if firstErr != nil {
return nil, firstErr
}
return nil, errors.New("unknown time zone " + name) return nil, errors.New("unknown time zone " + name)
} }

9
src/time/zoneinfo_windows.go
View File

@ -260,11 +260,12 @@ func initLocal() {
} }
func loadLocation(name string) (*Location, error) { func loadLocation(name string) (*Location, error) {
if z, err := loadZoneFile(runtime.GOROOT()+`\lib\time\zoneinfo.zip`, name); err == nil { z, err := loadZoneFile(runtime.GOROOT()+`\lib\time\zoneinfo.zip`, name)
z.name = name if err != nil {
return z, nil return nil, err
} }
return nil, errors.New("unknown time zone " + name) z.name = name
return z, nil
} }
func forceZipFileForTesting(zipOnly bool) { func forceZipFileForTesting(zipOnly bool) {