Merge pull request #15 from trivago/Improve-logging

Improve logging on pot create fail and pot destroy failure
bsdpot · Jan 29, 2020 · 3a1be66 · 3a1be66
2 parents 31398b3 + 0fb844e
commit 3a1be66
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 6 deletions.
diff --git a/driver/driver.go b/driver/driver.go
@@ -384,20 +384,29 @@ func (d *Driver) StartTask(cfg *drivers.TaskConfig) (*drivers.TaskHandle, *drive
 		if exists == 0 {
 			if err := se.createContainer(cfg); err != nil {
 				//Destroy container if err on creation
-				se.destroyContainer(cfg)
+				err := se.destroyContainer(cfg)
+				if err != nil {
+					d.logger.Error("Error destroying container with err: ", err)
+				}
 				return nil, nil, fmt.Errorf("unable to create container: %v", err)
 			}
 			d.logger.Trace("StartTask", "Created container, se:", se)
 
 			if err := se.startContainer(cfg); err != nil {
-				se.destroyContainer(cfg)
+				err := se.destroyContainer(cfg)
+				if err != nil {
+					d.logger.Error("Error destroying container with err: ", err)
+				}
 				return nil, nil, fmt.Errorf("unable to start container: %v", err)
 			}
 			d.logger.Trace("StartTask", "Started task, se", se)
 		} else {
 			d.logger.Trace("StartTask", "Container existed, se", se)
 			if err := se.startContainer(cfg); err != nil {
-				se.destroyContainer(cfg)
+				err := se.destroyContainer(cfg)
+				if err != nil {
+					d.logger.Error("Error destroying container with err: ", err)
+				}
 				return nil, nil, fmt.Errorf("unable to start container: %v", err)
 			}
 		}

diff --git a/driver/pot.go b/driver/pot.go
@@ -287,7 +287,7 @@ func (s *syexec) createContainer(commandCfg *drivers.TaskConfig) error {
 	_, err = exec.Command("sh", "-c", s.argvEnv).Output()
 	if err != nil {
 		message := "Error setting env variables for pot with err: " + err.Error()
-		s.logger.Error(message)
+		return errors.New(string(message))
 	}
 
 	// Set hosts file inside the pot
@@ -297,7 +297,7 @@ func (s *syexec) createContainer(commandCfg *drivers.TaskConfig) error {
 	_, err = exec.Command("sh", "-c", s.argvExtraHosts).Output()
 	if err != nil {
 		message := "Error setting hosts file for pot with err: " + err.Error()
-		s.logger.Error(message)
+		return errors.New(string(message))
 	}
 
 	//Set memory limit for pot
@@ -307,7 +307,7 @@ func (s *syexec) createContainer(commandCfg *drivers.TaskConfig) error {
 	_, err = exec.Command("sh", "-c", s.argvMem).Output()
 	if err != nil {
 		message := "Error setting memory limit for pot with err: " + err.Error()
-		s.logger.Error(message)
+		return errors.New(string(message))
 	}
 
 	return nil