containers
/
automation-tests
mirror of https://github.com/containers/automation-tests.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7171 from jwhonce/wip/varlink_timeout 

Fix podman service --valink timeout
This commit is contained in:
OpenShift Merge Robot 2020-08-01 09:17:35 -04:00 committed by GitHub
parent de460bf978 02eefe650c
commit b425a4f4ac
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cmd/podman/system/service.go
View File

@ -49,7 +49,7 @@ func init() {
flags := srvCmd.Flags() flags := srvCmd.Flags()
flags.Int64VarP(&srvArgs.Timeout, "time", "t", 5, "Time until the service session expires in seconds. Use 0 to disable the timeout") flags.Int64VarP(&srvArgs.Timeout, "time", "t", 5, "Time until the service session expires in seconds. Use 0 to disable the timeout")
flags.BoolVar(&srvArgs.Varlink, "varlink", false, "Use legacy varlink service instead of REST") flags.BoolVar(&srvArgs.Varlink, "varlink", false, "Use legacy varlink service instead of REST. Unit of --time changes from seconds to milliseconds.")
_ = flags.MarkDeprecated("varlink", "valink API is deprecated.") _ = flags.MarkDeprecated("varlink", "valink API is deprecated.")
flags.SetNormalizeFunc(aliasTimeoutFlag) flags.SetNormalizeFunc(aliasTimeoutFlag)
@ -88,14 +88,15 @@ func service(cmd *cobra.Command, args []string) error {
opts := entities.ServiceOptions{ opts := entities.ServiceOptions{
URI: apiURI, URI: apiURI,
Timeout: time.Duration(srvArgs.Timeout) * time.Second,
Command: cmd, Command: cmd,
} }
if srvArgs.Varlink { if srvArgs.Varlink {
opts.Timeout = time.Duration(srvArgs.Timeout) * time.Millisecond
return registry.ContainerEngine().VarlinkService(registry.GetContext(), opts) return registry.ContainerEngine().VarlinkService(registry.GetContext(), opts)
} }
opts.Timeout = time.Duration(srvArgs.Timeout) * time.Second
return restService(opts, cmd.Flags(), registry.PodmanConfig()) return restService(opts, cmd.Flags(), registry.PodmanConfig())
} }