close_issue_2
/
tools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dashboard/buildlet: fix start-up crash when TLS attributes aren't set 

I had never run the 44d7ecb402 on GCE, and never caught that it
crashed on start-up if TLS attributes weren't defined.

Updated to use the new NotDefinedError from the metadata package in
https://code-review.googlesource.com/#/c/1790/

Change-Id: Iaec8df126e4cef8026c930e8cc0163ae088affb3
Reviewed-on: https://go-review.googlesource.com/2736
Reviewed-by: Burcu Dogan <jbd@google.com>
This commit is contained in:
Brad Fitzpatrick 2015-01-14 14:52:45 -08:00
parent ac8637e9fa
commit c573f9d0b5
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dashboard/buildlet/buildlet.go
View File

@ -119,6 +119,7 @@ func main() {
} }
// metadataValue returns the GCE metadata instance value for the given key. // metadataValue returns the GCE metadata instance value for the given key.
// If the metadata is not defined, the returned string is empty.
// //
// If not running on GCE, it falls back to using environment variables // If not running on GCE, it falls back to using environment variables
// for local development. // for local development.
@ -126,6 +127,9 @@ func metadataValue(key string) string {
// The common case: // The common case:
if metadata.OnGCE() { if metadata.OnGCE() {
v, err := metadata.InstanceAttributeValue(key) v, err := metadata.InstanceAttributeValue(key)
if _, notDefined := err.(metadata.NotDefinedError); notDefined {
return ""
}
if err != nil { if err != nil {
log.Fatalf("metadata.InstanceAttributeValue(%q): %v", key, err) log.Fatalf("metadata.InstanceAttributeValue(%q): %v", key, err)
} }