From ee39c9d541c9ed9d83c0a44959e687c4997c61e8 Mon Sep 17 00:00:00 2001 From: Dmitry Kropachev Date: Tue, 1 Oct 2024 06:49:16 -0400 Subject: [PATCH] Add --query-timeout and --connection-timeout options (#293) --- cmd/schemagen/schemagen.go | 33 ++++++++++++++++++++++++--------- 1 file changed, 24 insertions(+), 9 deletions(-) diff --git a/cmd/schemagen/schemagen.go b/cmd/schemagen/schemagen.go index 3eb9e57..11b49ea 100644 --- a/cmd/schemagen/schemagen.go +++ b/cmd/schemagen/schemagen.go @@ -21,16 +21,25 @@ import ( _ "github.com/scylladb/gocqlx/v3/table" ) +var defaultClusterConfig = gocql.NewCluster() + +var ( + defaultQueryTimeout = defaultClusterConfig.Timeout + defaultConnectionTimeout = defaultClusterConfig.ConnectTimeout +) + var ( - cmd = flag.NewFlagSet(os.Args[0], flag.ExitOnError) - flagCluster = cmd.String("cluster", "127.0.0.1", "a comma-separated list of host:port tuples") - flagKeyspace = cmd.String("keyspace", "", "keyspace to inspect") - flagPkgname = cmd.String("pkgname", "models", "the name you wish to assign to your generated package") - flagOutput = cmd.String("output", "models", "the name of the folder to output to") - flagUser = cmd.String("user", "", "user for password authentication") - flagPassword = cmd.String("password", "", "password for password authentication") - flagIgnoreNames = cmd.String("ignore-names", "", "a comma-separated list of table, view or index names to ignore") - flagIgnoreIndexes = cmd.Bool("ignore-indexes", false, "don't generate types for indexes") + cmd = flag.NewFlagSet(os.Args[0], flag.ExitOnError) + flagCluster = cmd.String("cluster", "127.0.0.1", "a comma-separated list of host:port tuples") + flagKeyspace = cmd.String("keyspace", "", "keyspace to inspect") + flagPkgname = cmd.String("pkgname", "models", "the name you wish to assign to your generated package") + flagOutput = cmd.String("output", "models", "the name of the folder to output to") + flagUser = cmd.String("user", "", "user for password authentication") + flagPassword = cmd.String("password", "", "password for password authentication") + flagIgnoreNames = cmd.String("ignore-names", "", "a comma-separated list of table, view or index names to ignore") + flagIgnoreIndexes = cmd.Bool("ignore-indexes", false, "don't generate types for indexes") + flagQueryTimeout = cmd.Duration("query-timeout", defaultQueryTimeout, "query timeout ( in seconds )") + flagConnectionTimeout = cmd.Duration("connection-timeout", defaultConnectionTimeout, "connection timeout ( in seconds )") ) //go:embed keyspace.tmpl @@ -152,6 +161,12 @@ func createSession() (gocqlx.Session, error) { Password: *flagPassword, } } + if *flagQueryTimeout >= 0 { + cluster.Timeout = *flagQueryTimeout + } + if *flagConnectionTimeout >= 0 { + cluster.ConnectTimeout = *flagConnectionTimeout + } return gocqlx.WrapSession(cluster.CreateSession()) }