Merge branch 'develop'

Author: Tom Elliott

.travis.yml

@@ -1,7 +1,7 @@
 language: go
 
 before_script:
-  - wget https://github.com/spf13/hugo/releases/download/v0.26/hugo_0.26_Linux-64bit.tar.gz -O /tmp/hugo.tar.gz
+  - wget https://github.com/spf13/hugo/releases/download/v0.29/hugo_0.29_Linux-64bit.tar.gz -O /tmp/hugo.tar.gz
   - mkdir /tmp/hugo
   - tar -xvf /tmp/hugo.tar.gz -C /tmp/hugo
   - export PATH=$PATH:/tmp/hugo/

Gopkg.lock

@@ -28,7 +28,6 @@ var restartFlags struct {
 	noWatch   *bool
 	tail      *bool
 	exclude   *[]string
-	timeout   *int
 	force     *bool
 }
 
@@ -40,5 +39,4 @@ func init() {
 	restartFlags.force = restartCmd.Flags().BoolP("force", "f", false, "Skip confirmation prompt")
 	restartFlags.tail = restartCmd.Flags().BoolP("tail", "t", false, "After starting, tail logs for services.")
 	restartFlags.exclude = restartCmd.Flags().StringArrayP("exclude", "e", nil, "Exclude `SERVICE` from this operation")
-	restartFlags.timeout = restartCmd.Flags().Int("timeout", 30, "The amount of time in seconds that Edward will wait for a service to launch before timing out. Defaults to 30s")
 }

cmd/restart.go

@@ -16,6 +16,7 @@ import (
 	"github.com/yext/edward/config"
 	"github.com/yext/edward/edward"
 	"github.com/yext/edward/home"
+	"github.com/yext/edward/output"
 	"github.com/yext/edward/services"
 	"github.com/yext/edward/updates"
 )
@@ -36,6 +37,21 @@ var RootCmd = &cobra.Command{
 Build, start and manage service instances with a single command.`,
 	SilenceUsage: true,
 	PersistentPreRunE: func(cmd *cobra.Command, args []string) error {
+		if redirectLogs {
+			logger = log.New(os.Stdout, fmt.Sprintf("%v >", os.Args), log.Ldate|log.Ltime|log.Lmicroseconds|log.Lshortfile)
+		}
+		if logFile != "" {
+			prefix := "edward"
+			if len(args) > 0 {
+				prefix = fmt.Sprintf("%s %s", cmd.Use, args[0])
+			}
+			logger = log.New(&lumberjack.Logger{
+				Filename:   logFile,
+				MaxSize:    50, // megabytes
+				MaxBackups: 30,
+				MaxAge:     1, //days
+			}, fmt.Sprintf("%s > ", prefix), log.Ldate|log.Ltime|log.Lmicroseconds|log.Lshortfile)
+		}
 		// Begin logging
 		logger.Printf("=== Edward v%v ===\n", common.EdwardVersion)
 		logger.Printf("Args: %v\n", os.Args)
@@ -53,7 +69,7 @@ Build, start and manage service instances with a single command.`,
 
 		var err error
 		if command != "generate" {
-			edwardClient, err = edward.NewClientWithConfig(configPath, common.EdwardVersion)
+			edwardClient, err = edward.NewClientWithConfig(configPath, common.EdwardVersion, logger)
 			if err != nil {
 				return errors.WithStack(err)
 			}
@@ -76,6 +92,13 @@ Build, start and manage service instances with a single command.`,
 		// Populate the Edward executable with this binary
 		edwardClient.EdwardExecutable = os.Args[0]
 
+		// Let the client know about the log file for starting runners
+		edwardClient.LogFile = logFile
+
+		if redirectLogs {
+			edwardClient.Follower = output.NewNonLiveFollower()
+		}
+
 		if command != "stop" {
 			// Check for legacy pidfiles and error out if any are found
 			for _, service := range edwardClient.ServiceMap() {
@@ -112,12 +135,17 @@ func Execute() {
 		fmt.Printf("%+v", err)
 	}
 
+	logPrefix := "edward"
+	if len(os.Args) > 1 {
+		logPrefix = fmt.Sprintf("edward %v >", os.Args[1:])
+	}
+
 	logger = log.New(&lumberjack.Logger{
 		Filename:   filepath.Join(home.EdwardConfig.EdwardLogDir, "edward.log"),
 		MaxSize:    50, // megabytes
 		MaxBackups: 30,
 		MaxAge:     1, //days
-	}, fmt.Sprintf("%v >", os.Args), log.Ldate|log.Ltime|log.Lmicroseconds|log.Lshortfile)
+	}, logPrefix, log.Ldate|log.Ltime|log.Lmicroseconds|log.Lshortfile)
 
 	for _, arg := range os.Args {
 		if arg == "--generate-bash-completion" {
@@ -127,16 +155,29 @@ func Execute() {
 	}
 
 	if err := RootCmd.Execute(); err != nil {
+		logger.Printf("Error: %v\n", err)
 		os.Exit(1)
 	}
 }
 
 var configPath string
+var redirectLogs bool
+var logFile string
 
 func init() {
 	cobra.OnInitialize(initConfig)
 
+	RootCmd.PersistentFlags().StringVar(&logFile, "logfile", "", "Write logs to `PATH`")
 	RootCmd.PersistentFlags().StringVarP(&configPath, "config", "c", "", "Use service configuration file at `PATH`")
+	RootCmd.PersistentFlags().BoolVar(&redirectLogs, "redirect_logs", false, "Redirect edward logs to the console")
+	err := RootCmd.PersistentFlags().MarkHidden("redirect_logs")
+	if err != nil {
+		panic(err)
+	}
+	err = RootCmd.PersistentFlags().MarkHidden("logfile")
+	if err != nil {
+		panic(err)
+	}
 }
 
 // initConfig reads in config file and ENV variables if set.
@@ -148,7 +189,7 @@ func initConfig() {
 		// Find home directory.
 		home, err := homedir.Dir()
 		if err != nil {
-			fmt.Println(err)
+			fmt.Println("initConfig: error finding home dir:", err)
 			os.Exit(1)
 		}
 
@@ -167,7 +208,7 @@ func initConfig() {
 
 func checkUpdateAvailable(checkUpdateChan chan interface{}) {
 	defer close(checkUpdateChan)
-	updateAvailable, latestVersion, err := updates.UpdateAvailable("yext", "edward", common.EdwardVersion, filepath.Join(home.EdwardConfig.Dir, ".updatecache"), logger)
+	updateAvailable, latestVersion, err := updates.UpdateAvailable("yext", "edward", common.EdwardVersion, filepath.Join(home.EdwardConfig.Dir, ".cache/version"), logger)
 	if err != nil {
 		logger.Println("Error checking for updates:", err)
 		return

cmd/root.go

@@ -1,10 +1,10 @@
 package cmd
 
 import (
+	"fmt"
+
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
-	"github.com/yext/edward/common"
-	"github.com/yext/edward/config"
 	"github.com/yext/edward/runner"
 )
 
@@ -13,23 +13,18 @@ var runCmd = &cobra.Command{
 	Use:    "run",
 	Hidden: true,
 	RunE: func(cmd *cobra.Command, args []string) error {
-		configPath, err := config.GetConfigPathFromWorkingDirectory()
-		if err != nil {
-			return errors.WithStack(err)
-		}
-		cfg, err := config.LoadConfig(configPath, common.EdwardVersion, logger)
-		if err != nil {
-			return errors.WithMessage(err, configPath)
+		service := edwardClient.ServiceMap()[args[0]]
+		if service == nil {
+			return fmt.Errorf("service not found: %s", args[0])
 		}
-
 		r := &runner.Runner{
-			Service: cfg.ServiceMap[args[0]],
+			Service: service,
 		}
 		r.NoWatch = *runFlags.noWatch
 		r.WorkingDir = *runFlags.directory
 		r.Logger = logger
-		r.Run(args)
-		return nil
+		err := r.Run(args)
+		return errors.WithStack(err)
 	},
 }
 
@@ -43,4 +38,5 @@ func init() {
 
 	runFlags.noWatch = runCmd.Flags().Bool("no-watch", false, "Disable autorestart")
 	runFlags.directory = runCmd.Flags().StringP("directory", "d", "", "Working directory")
+	_ = runCmd.Flags().StringArrayP("tag", "t", nil, "Tags to distinguish this instance of Edward")
 }

cmd/run.go

@@ -21,7 +21,6 @@ var startFlags struct {
 	noWatch   *bool
 	tail      *bool
 	exclude   *[]string
-	timeout   *int
 }
 
 func init() {
@@ -31,5 +30,4 @@ func init() {
 	startFlags.noWatch = startCmd.Flags().Bool("no-watch", false, "Disable autorestart")
 	startFlags.tail = startCmd.Flags().BoolP("tail", "t", false, "After starting, tail logs for services.")
 	startFlags.exclude = startCmd.Flags().StringArrayP("exclude", "e", nil, "Exclude `SERVICE` from this operation")
-	startFlags.timeout = startCmd.Flags().Int("timeout", 30, "The amount of time in seconds that Edward will wait for a service to launch before timing out. Defaults to 30s")
 }

cmd/start.go

@@ -1,3 +1,3 @@
 package common
 
-const EdwardVersion = "1.8.5"
+const EdwardVersion = "1.8.6"

common/version.go

@@ -46,6 +46,9 @@ type GroupDef struct {
 
 // LoadConfig loads configuration from an io.Reader with the working directory explicitly specified
 func LoadConfig(filePath string, edwardVersion string, logger common.Logger) (Config, error) {
+	if logger != nil {
+		logger.Printf("Loading config from: %s\n", filePath)
+	}
 	reader, err := os.Open(filePath)
 	if err != nil {
 		return Config{}, errors.WithStack(err)
@@ -73,7 +76,6 @@ func LoadConfig(filePath string, edwardVersion string, logger common.Logger) (Co
 	err = config.initMaps()
 
 	config.printf("Config loaded with: %d groups and %d services\n", len(config.GroupMap), len(config.ServiceMap))
-
 	return config, errors.WithStack(err)
 }
 

config/config.go

@@ -10,7 +10,7 @@
     <meta name="viewport" content="width=device-width,user-scalable=no,initial-scale=1,maximum-scale=1">
     <meta http-equiv="X-UA-Compatible" content="IE=10" />
     <title>Autocompletion - Edward Docs</title>
-    <meta name="generator" content="Hugo 0.26" />
+    <meta name="generator" content="Hugo 0.29" />
 
 
     <meta name="description" content="A command line tool for managing local instances of microservices.">
@@ -134,7 +134,7 @@
     <div class="banner">
 
       <div class="name">
-        <strong>Edward Docs <span class="version">1.8.5</span></strong>
+        <strong>Edward Docs <span class="version">1.8.6</span></strong>
 
           <br>
           yext/edward

docs/autocompletion/index.html

@@ -10,7 +10,7 @@
     <meta name="viewport" content="width=device-width,user-scalable=no,initial-scale=1,maximum-scale=1">
     <meta http-equiv="X-UA-Compatible" content="IE=10" />
     <title>Commands - Edward Docs</title>
-    <meta name="generator" content="Hugo 0.26" />
+    <meta name="generator" content="Hugo 0.29" />
 
 
     <meta name="description" content="A command line tool for managing local instances of microservices.">
@@ -134,7 +134,7 @@
     <div class="banner">
 
       <div class="name">
-        <strong>Edward Docs <span class="version">1.8.5</span></strong>
+        <strong>Edward Docs <span class="version">1.8.6</span></strong>
 
           <br>
           yext/edward