balki/pgweb
1
0
Fork 0
Code Pull Requests Activity

Configure client side query timeout (#610)

Browse Source 
* Configure client side query timeout
* Update test command on windows
* Make query timeout cli opt an uint
* Fix windows test command
* Check for updates when rendering connection page
* Fix typo
This commit is contained in:
Dan Sosedoff
2022-12-08 15:07:40 -06:00
committed by GitHub
parent 0008842a68
commit 7557ac854e
3 changed files with 42 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/api/api.go
View File

@@ -507,7 +507,13 @@ func GetBookmarks(c *gin.Context) {
// GetInfo renders the pgweb system information
func GetInfo(c *gin.Context) {
successResponse(c, command.Info)
successResponse(c, gin.H{
"app": command.Info,
"features": gin.H{
"session_lock": command.Opts.LockSession,
"query_timeout": command.Opts.QueryTimeout,
},
})
}
// DataExport performs database table export

2
pkg/command/options.go
View File

@@ -49,7 +49,7 @@ type Options struct {
ConnectHeaders string `long:"connect-headers" description:"List of headers to pass to the connect backend"`
DisableConnectionIdleTimeout bool `long:"no-idle-timeout" description:"Disable connection idle timeout"`
ConnectionIdleTimeout int `long:"idle-timeout" description:"Set connection idle timeout in minutes" default:"180"`
QueryTimeout int `long:"query-timeout" description:"Set global query execution timeout in seconds" default:"0"`
QueryTimeout uint `long:"query-timeout" description:"Set global query execution timeout in seconds" default:"300"`
Cors bool `long:"cors" description:"Enable Cross-Origin Resource Sharing (CORS)"`
CorsOrigin string `long:"cors-origin" description:"Allowed CORS origins" default:"*"`
BinaryCodec string `long:"binary-codec" description:"Codec for binary data serialization, one of 'none', 'hex', 'base58', 'base64'" default:"none"`