cli: read query timeout from config file; fix cayleygraph#613

clouditor · Jul 27, 2017 · f4d9bdb · f4d9bdb
1 parent 6dd377f
commit f4d9bdb
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 12 deletions.
diff --git a/cayley_example.yml b/cayley_example.yml
@@ -8,6 +8,8 @@ store:
   # backend-specific options
   options:
     nosync: false
+query:
+  timeout: 30s
 load:
   ignore_duplicates: false
   ignore_missing: false

diff --git a/cmd/cayley/command/http.go b/cmd/cayley/command/http.go
@@ -23,10 +23,8 @@ func NewHttpCmd() *cobra.Command {
 			printBackendInfo()
 			p := mustSetupProfile(cmd)
 			defer mustFinishProfile(p)
-			timeout, err := cmd.Flags().GetDuration("timeout")
-			if err != nil {
-				return err
-			}
+
+			timeout := viper.GetDuration(keyQueryTimeout)
 			if init, err := cmd.Flags().GetBool("init"); err != nil {
 				return err
 			} else if init {
@@ -71,5 +69,6 @@ func NewHttpCmd() *cobra.Command {
 	cmd.Flags().DurationP("timeout", "t", 30*time.Second, "elapsed time until an individual query times out")
 	cmd.Flags().StringVar(&chttp.AssetsPath, "assets", "", "explicit path to the HTTP assets")
 	registerLoadFlags(cmd)
+	viper.BindPFlag(keyQueryTimeout, cmd.Flags().Lookup("timeout"))
 	return cmd
 }
diff --git a/cmd/cayley/command/repl.go b/cmd/cayley/command/repl.go
@@ -10,6 +10,7 @@ import (
 	"time"
 
 	"github.com/spf13/cobra"
+	"github.com/spf13/viper"
 	"golang.org/x/net/context"
 
 	"github.com/cayleygraph/cayley/clog"
@@ -20,6 +21,10 @@ import (
 	"github.com/cayleygraph/cayley/query"
 )
 
+const (
+	keyQueryTimeout = "query.timeout"
+)
+
 func getContext() (context.Context, func()) {
 	ctx, cancel := context.WithCancel(context.Background())
 	ch := make(chan os.Signal, 1)
@@ -64,6 +69,7 @@ func registerQueryFlags(cmd *cobra.Command) {
 	cmd.Flags().Bool("init", false, "initialize the database before using it")
 	cmd.Flags().String("lang", "gizmo", `query language to use ("`+strings.Join(langs, `", "`)+`")`)
 	cmd.Flags().DurationP("timeout", "t", 30*time.Second, "elapsed time until an individual query times out")
+	viper.BindPFlag(keyQueryTimeout, cmd.Flags().Lookup("timeout"))
 	registerLoadFlags(cmd)
 }
 
@@ -85,10 +91,7 @@ func NewReplCmd() *cobra.Command {
 			ctx, cancel := getContext()
 			defer cancel()
 
-			timeout, err := cmd.Flags().GetDuration("timeout")
-			if err != nil {
-				return err
-			}
+			timeout := viper.GetDuration("timeout")
 			lang, _ := cmd.Flags().GetString("lang")
 			return db.Repl(ctx, h, lang, timeout)
 		},
@@ -129,10 +132,7 @@ func NewQueryCmd() *cobra.Command {
 			ctx, cancel := getContext()
 			defer cancel()
 
-			timeout, err := cmd.Flags().GetDuration("timeout")
-			if err != nil {
-				return err
-			}
+			timeout := viper.GetDuration("timeout")
 			if timeout > 0 {
 				ctx, cancel = context.WithTimeout(ctx, timeout)
 				defer cancel()