Return validation error when ondemand and m3 are run together #14

Author: andy-tier1app

internal/agent/agent.go

@@ -15,6 +15,7 @@ import (
 )
 
 var ErrNothingCanBeDone = errors.New("nothing can be done")
+var ErrConflictingMode = errors.New("conflicting mode")
 
 func Run() error {
 	startupLogs()
@@ -30,6 +31,14 @@ func Run() error {
 		return ErrNothingCanBeDone
 	}
 
+	// Validation: if ondemand and m3 are both enabled, abort here
+	// Because it causes an issue with capture dir in ondemand.go
+	if onDemandMode && m3Mode {
+		logger.Error().Msg("OnDemand and M3 mode can not run together.")
+
+		return ErrConflictingMode
+	}
+
 	// TODO: This is for backward compatibility: API mode can run along with on demand and M3.
 	// Nobody of us knows whether there's any customer using this (on demand + API mode)
 	// I think we should clean it up eventually.

internal/cli/cli.go

@@ -44,7 +44,7 @@ func Run() {
 
 	err = runToCompletionOrSigterm(agent.Run)
 	if err != nil {
-		logger.Log("Error: %s", err.Error())
+		logger.Err(err).Msg("Error encountered")
 	}
 
 	logger.Log("yc-360 script is shutting down...")