opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-05-20 08:36:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add support for retrieving system service --timeout

Browse Source 
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
This commit is contained in:
Daniel J Walsh
2021-09-20 12:09:06 -04:00
parent cc6a85bcde
commit b74edfb0a1
4 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -52,8 +52,9 @@ func init() {
flags := srvCmd.Flags() flags := srvCmd.Flags()
cfg := registry.PodmanConfig()
timeFlagName := "time" timeFlagName := "time"
flags.Int64VarP(&srvArgs.Timeout, timeFlagName, "t", 5, "Time until the service session expires in seconds. Use 0 to disable the timeout") flags.Int64VarP(&srvArgs.Timeout, timeFlagName, "t", int64(cfg.Engine.ServiceTimeout), "Time until the service session expires in seconds. Use 0 to disable the timeout")
_ = srvCmd.RegisterFlagCompletionFunc(timeFlagName, completion.AutocompleteNone) _ = srvCmd.RegisterFlagCompletionFunc(timeFlagName, completion.AutocompleteNone)
flags.StringVarP(&srvArgs.CorsHeaders, "cors", "", "", "Set CORS Headers") flags.StringVarP(&srvArgs.CorsHeaders, "cors", "", "", "Set CORS Headers")
_ = srvCmd.RegisterFlagCompletionFunc("cors", completion.AutocompleteNone) _ = srvCmd.RegisterFlagCompletionFunc("cors", completion.AutocompleteNone)

5
docs/source/markdown/podman-system-service.1.md
View File

@ -30,6 +30,9 @@ Note: The default systemd unit files (system and user) change the log-level opti
The time until the session expires in _seconds_. The default is 5 The time until the session expires in _seconds_. The default is 5
seconds. A value of `0` means no timeout, therefore the session will not expire. seconds. A value of `0` means no timeout, therefore the session will not expire.
The default timeout can be changed via the `service_timeout=VALUE` field in containers.conf.
See **[containers.conf(5)](https://github.com/containers/common/blob/master/docs/containers.conf.5.md)** for more information.
#### **--cors** #### **--cors**
CORS headers to inject to the HTTP response. The default value is empty string which disables CORS headers. CORS headers to inject to the HTTP response. The default value is empty string which disables CORS headers.
@ -46,7 +49,7 @@ podman system service --time 5
``` ```
## SEE ALSO ## SEE ALSO
podman(1), podman-system-service(1), podman-system-connection(1) **[podman(1)](podman.1.md)**, **[podman-system-connection(1)](podman-system-connection.1.md)**, **[containers.conf(5)](https://github.com/containers/common/blob/master/docs/containers.conf.5.md)**
## HISTORY ## HISTORY
January 2020, Originally compiled by Brent Baude `<bbaude@redhat.com>` January 2020, Originally compiled by Brent Baude `<bbaude@redhat.com>`

1
test/e2e/config/containers.conf
View File

@ -59,6 +59,7 @@ no_hosts=true
[engine] [engine]
network_cmd_options=["allow_host_loopback=true"] network_cmd_options=["allow_host_loopback=true"]
service_timeout=1234
# We need to ensure each test runs on a separate plugin instance... # We need to ensure each test runs on a separate plugin instance...
# For now, let's just make a bunch of plugin paths and have each test use one. # For now, let's just make a bunch of plugin paths and have each test use one.

8
test/e2e/containers_conf_test.go
View File

@ -444,4 +444,12 @@ var _ = Describe("Podman run", func() {
Expect(session).Should(Exit(0)) Expect(session).Should(Exit(0))
Expect(session.ErrorToString()).To(ContainSubstring("invalid image_copy_tmp_dir")) Expect(session.ErrorToString()).To(ContainSubstring("invalid image_copy_tmp_dir"))
}) })
It("podman system sevice --help shows (default 20)", func() {
SkipIfRemote("this test is only for local")
result := podmanTest.Podman([]string{"system", "service", "--help"})
result.WaitWithDefaultTimeout()
Expect(result).Should(Exit(0))
Expect(result.OutputToString()).To(ContainSubstring("(default 1234)"))
})
}) })