Merge pull request #1200 from ryotarai/lock-pass-stdin

command/lock: Pass stdin to child process when -pass-stdin passed.
hashicorp · Sep 1, 2015 · 26ce9d1 · 26ce9d1
2 parents 4746c0f + b2755d0
commit 26ce9d1
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 3 deletions.
diff --git a/command/lock.go b/command/lock.go
@@ -65,6 +65,7 @@ Options:
                              a semaphore is used.
   -name=""                   Optional name to associate with lock session.
   -token=""                  ACL token to use. Defaults to that of agent.
+  -pass-stdin                Pass stdin to child process.
   -verbose                   Enables verbose output
 `
 	return strings.TrimSpace(helpText)
@@ -74,11 +75,13 @@ func (c *LockCommand) Run(args []string) int {
 	var childDone chan struct{}
 	var name, token string
 	var limit int
+	var passStdin bool
 	cmdFlags := flag.NewFlagSet("watch", flag.ContinueOnError)
 	cmdFlags.Usage = func() { c.Ui.Output(c.Help()) }
 	cmdFlags.IntVar(&limit, "n", 1, "")
 	cmdFlags.StringVar(&name, "name", "", "")
 	cmdFlags.StringVar(&token, "token", "", "")
+	cmdFlags.BoolVar(&passStdin, "pass-stdin", false, "")
 	cmdFlags.BoolVar(&c.verbose, "verbose", false, "")
 	httpAddr := HTTPAddrFlag(cmdFlags)
 	if err := cmdFlags.Parse(args); err != nil {
@@ -160,7 +163,7 @@ func (c *LockCommand) Run(args []string) int {
 	// Start the child process
 	childDone = make(chan struct{})
 	go func() {
-		if err := c.startChild(script, childDone); err != nil {
+		if err := c.startChild(script, childDone, passStdin); err != nil {
 			c.Ui.Error(fmt.Sprintf("%s", err))
 		}
 	}()
@@ -261,7 +264,7 @@ func (c *LockCommand) setupSemaphore(client *api.Client, limit int, prefix, name
 
 // startChild is a long running routine used to start and
 // wait for the child process to exit.
-func (c *LockCommand) startChild(script string, doneCh chan struct{}) error {
+func (c *LockCommand) startChild(script string, doneCh chan struct{}, passStdin bool) error {
 	defer close(doneCh)
 	if c.verbose {
 		c.Ui.Info(fmt.Sprintf("Starting handler '%s'", script))
@@ -277,7 +280,14 @@ func (c *LockCommand) startChild(script string, doneCh chan struct{}) error {
 	cmd.Env = append(os.Environ(),
 		"CONSUL_LOCK_HELD=true",
 	)
-	cmd.Stdin = nil
+	if passStdin {
+		if c.verbose {
+			c.Ui.Info("Stdin passed to handler process")
+		}
+		cmd.Stdin = os.Stdin
+	} else {
+		cmd.Stdin = nil
+	}
 	cmd.Stdout = os.Stdout
 	cmd.Stderr = os.Stderr
 

diff --git a/website/source/docs/commands/lock.html.markdown b/website/source/docs/commands/lock.html.markdown
@@ -60,5 +60,7 @@ The list of available flags are:
 
 * `-token` - ACL token to use. Defaults to that of agent.
 
+* `-pass-stdin` - Pass stdin to child process.
+
 * `-verbose` - Enables verbose output.
Original file line number	Diff line number	Diff line change
Expand Up		@@ -60,5 +60,7 @@ The list of available flags are:

		* `-token` - ACL token to use. Defaults to that of agent.

		* `-pass-stdin` - Pass stdin to child process.

		* `-verbose` - Enables verbose output.