Add --query-timeout and --connection-timeout options (#293)

This commit is contained in:
Dmitry Kropachev
2024-10-01 06:49:16 -04:00
committed by GitHub
parent 877066f0c8
commit ee39c9d541

View File

@@ -21,6 +21,13 @@ import (
_ "github.com/scylladb/gocqlx/v3/table" _ "github.com/scylladb/gocqlx/v3/table"
) )
var defaultClusterConfig = gocql.NewCluster()
var (
defaultQueryTimeout = defaultClusterConfig.Timeout
defaultConnectionTimeout = defaultClusterConfig.ConnectTimeout
)
var ( var (
cmd = flag.NewFlagSet(os.Args[0], flag.ExitOnError) cmd = flag.NewFlagSet(os.Args[0], flag.ExitOnError)
flagCluster = cmd.String("cluster", "127.0.0.1", "a comma-separated list of host:port tuples") flagCluster = cmd.String("cluster", "127.0.0.1", "a comma-separated list of host:port tuples")
@@ -31,6 +38,8 @@ var (
flagPassword = cmd.String("password", "", "password 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") 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") 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 //go:embed keyspace.tmpl
@@ -152,6 +161,12 @@ func createSession() (gocqlx.Session, error) {
Password: *flagPassword, Password: *flagPassword,
} }
} }
if *flagQueryTimeout >= 0 {
cluster.Timeout = *flagQueryTimeout
}
if *flagConnectionTimeout >= 0 {
cluster.ConnectTimeout = *flagConnectionTimeout
}
return gocqlx.WrapSession(cluster.CreateSession()) return gocqlx.WrapSession(cluster.CreateSession())
} }