Fixing timeout and no-log-prefix flags logic

CHANGELOG.md

@@ -9,7 +9,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ### Added 
 
-- `--no-log-prefix` option for `cartridge start` command to disable instance name prefix in logs
+- `--no-log-prefix` option for `cartridge start` command to disable instance name prefix in logs when running interactively.
 
 ## [2.6.0] - 2021-01-27
 

cli/commands/start.go

@@ -43,7 +43,7 @@ func init() {
 	// stateboard flags
 	addStateboardRunningFlags(startCmd)
 
-	// Disable instance(s) prefix flag
+	// Disable instance name prefix in logs flag
 	startCmd.Flags().BoolVar(&ctx.Running.DisableLogPrefix, "no-log-prefix", false, disableLogPrefixUsage)
 
 	// common running paths
@@ -57,10 +57,12 @@ func init() {
 func runStartCmd(cmd *cobra.Command, args []string) error {
 	var err error
 
-	if timeoutStr == "" {
-		ctx.Running.DefaultTimeout = true
-	} else {
-		ctx.Running.DefaultTimeout = false
+	if timeoutStr == "" && !ctx.Running.Daemonize {
+		log.Warnf("--timeout flag is ignored due to starting instances interactively")
+	}
+
+	if ctx.Running.DisableLogPrefix && ctx.Running.Daemonize {
+		log.Warnf("--no-log-prefix flag is ignored due to startring instances in background")
 	}
 
 	if err := setDefaultValue(cmd.Flags(), "timeout", defaultStartTimeout.String()); err != nil {

cli/commands/usage.go

@@ -88,7 +88,7 @@ defaults to ./instances.yml ("cfg" in .cartridge.yml)`
 
 	stopForceUsage = `Force instance(s) stop (sends SIGKILL)`
 
-	disableLogPrefixUsage = `Disable instance(s) prefix in logs`
+	disableLogPrefixUsage = `Disable prefix in logs when run interactively`
 )
 
 // REPLICASETS

cli/context/context.go

@@ -63,9 +63,8 @@ type RunningCtx struct {
 	WithStateboard bool
 	StateboardOnly bool
 
-	Daemonize      bool
-	DefaultTimeout bool
-	StartTimeout   time.Duration
+	Daemonize    bool
+	StartTimeout time.Duration
 
 	LogFollow        bool
 	LogLines         int

cli/running/running.go

@@ -86,14 +86,6 @@ func Start(ctx *context.Ctx) error {
 		log.Warnf("Failed to check .rocks directory: %s", err)
 	}
 
-	if ctx.Running.DisableLogPrefix && ctx.Running.Daemonize {
-		log.Warnf("--no-log-prefix flag will be ignored.")
-	}
-
-	if !ctx.Running.Daemonize && !ctx.Running.DefaultTimeout {
-		log.Warnf("--timeout flag will be ignored.")
-	}
-
 	if err := processes.Start(ctx.Running.Daemonize, ctx.Running.DisableLogPrefix, ctx.Running.StartTimeout); err != nil {
 		return err
 	}

test/utils.py

@@ -116,9 +116,9 @@ def __init__(self, cartridge_cmd):
         self._instance_pids = set()
         self._subprocess = None
 
-    def start(self, project, instances=[], daemonized=False, stateboard=False,
-              stateboard_only=False, cfg=None, script=None, run_dir=None, data_dir=None,
-              log_dir=None, timeout=None, capture_output=False, exp_rc=0):
+    def start(self, project, instances=[], daemonized=False, stateboard=False, stateboard_only=False,
+              cfg=None, script=None, run_dir=None, data_dir=None, log_dir=None, timeout=None,
+              capture_output=False, exp_rc=0):
         cmd = [self._cartridge_cmd, 'start']
         if daemonized:
             cmd.append('-d')