| OLD | NEW |
| 1 // Copyright 2015 The LUCI Authors. All rights reserved. | 1 // Copyright 2015 The LUCI Authors. All rights reserved. |
| 2 // Use of this source code is governed under the Apache License, Version 2.0 | 2 // Use of this source code is governed under the Apache License, Version 2.0 |
| 3 // that can be found in the LICENSE file. | 3 // that can be found in the LICENSE file. |
| 4 | 4 |
| 5 package main | 5 package main |
| 6 | 6 |
| 7 import ( | 7 import ( |
| 8 "encoding/json" | 8 "encoding/json" |
| 9 "errors" | 9 "errors" |
| 10 "flag" | 10 "flag" |
| (...skipping 214 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 225 if !linkGen.canGenerateLinks() { | 225 if !linkGen.canGenerateLinks() { |
| 226 linkGen = nil | 226 linkGen = nil |
| 227 } | 227 } |
| 228 | 228 |
| 229 e := executor.Executor{ | 229 e := executor.Executor{ |
| 230 Options: annotee.Options{ | 230 Options: annotee.Options{ |
| 231 Base: types.StreamName(a.nameBase), | 231 Base: types.StreamName(a.nameBase), |
| 232 LinkGenerator: linkGen, | 232 LinkGenerator: linkGen, |
| 233 Client: client, | 233 Client: client, |
| 234 MetadataUpdateInterval: time.Duration(a.annotationInterv
al), | 234 MetadataUpdateInterval: time.Duration(a.annotationInterv
al), |
| 235 CloseSteps: true, |
| 235 }, | 236 }, |
| 236 | 237 |
| 237 Annotate: executor.AnnotationMode(a.annotate), | 238 Annotate: executor.AnnotationMode(a.annotate), |
| 238 Stdin: os.Stdin, | 239 Stdin: os.Stdin, |
| 239 } | 240 } |
| 240 if a.tee { | 241 if a.tee { |
| 241 e.TeeStdout = os.Stdout | 242 e.TeeStdout = os.Stdout |
| 242 e.TeeStderr = os.Stderr | 243 e.TeeStderr = os.Stderr |
| 243 } | 244 } |
| 244 if err := e.Run(a, args); err != nil { | 245 if err := e.Run(a, args); err != nil { |
| (...skipping 21 matching lines...) Expand all Loading... |
| 266 } | 267 } |
| 267 if err := a.maybeWriteResult(&br); err != nil { | 268 if err := a.maybeWriteResult(&br); err != nil { |
| 268 log.WithError(err).Warningf(a, "Failed to write bootstrap result
.") | 269 log.WithError(err).Warningf(a, "Failed to write bootstrap result
.") |
| 269 } | 270 } |
| 270 return e.ReturnCode() | 271 return e.ReturnCode() |
| 271 } | 272 } |
| 272 | 273 |
| 273 func main() { | 274 func main() { |
| 274 os.Exit(mainImpl(os.Args[1:])) | 275 os.Exit(mainImpl(os.Args[1:])) |
| 275 } | 276 } |
| OLD | NEW |