Merge pull request #125 from paypal/develop

develop to release
paypal · Jan 8, 2022 · 785b746 · 785b746
2 parents 0b2806d + 9a7077b
commit 785b746
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 8 deletions.
diff --git a/dce/main.go b/dce/main.go
@@ -269,7 +269,6 @@ func (exec *dockerComposeExecutor) LaunchTask(driver exec.ExecutorDriver, taskIn
 		tempStatus, err := pod.PluginPanicHandler(pod.ConditionFunc(func() (string, error) {
 			var tempStatus string
 			for _, ext := range extpoints {
-				logger.Println("Executing post launch task plugin")
 
 				granularMetricStepName := fmt.Sprintf("%s_PostLaunchTask", ext.Name())
 				pod.StartStep(pod.StepMetrics, granularMetricStepName)

diff --git a/pluginimpl/general/editor.go b/pluginimpl/general/editor.go
@@ -71,7 +71,7 @@ func editComposeFile(file string, executorId string, taskId string, ports *list.
 	}
 	pod.SetServiceDetail(filesMap)
 
-	logger.Printf("Updated compose files, current context: %v\n", filesMap)
+	logger.Debugf("Updated compose files, current context: %v", filesMap)
 	return file, ports, err
 }
 

diff --git a/pluginimpl/general/impl.go b/pluginimpl/general/impl.go
@@ -69,7 +69,7 @@ func (ge *generalExt) LaunchTaskPreImagePull(ctx context.Context, composeFiles *
 	var err error
 
 	logger.Println("====================context in====================")
-	logger.Printf("SERVICE_DETAIL: %+v", pod.GetServiceDetail())
+	logger.Debugf("SERVICE_DETAIL: %+v", pod.GetServiceDetail())
 
 	logger.Printf("Current compose files list: %v", *composeFiles)
 
@@ -133,7 +133,7 @@ func (ge *generalExt) LaunchTaskPreImagePull(ctx context.Context, composeFiles *
 	}
 
 	logger.Println("====================context out====================")
-	logger.Printf("SERVICE_DETAIL: %+v", pod.GetServiceDetail())
+	logger.Debugf("SERVICE_DETAIL: %+v", pod.GetServiceDetail())
 
 	*composeFiles = editedFiles
 

diff --git a/utils/file/file.go b/utils/file/file.go
@@ -200,7 +200,7 @@ func WriteToFile(file string, data []byte) (string, error) {
 		file = FolderPath(strings.Fields(file))[0]
 	}
 
-	log.Printf("Write to file : %s\n", file)
+	log.Debugf("Write to file : %s", file)
 	f, err := os.Create(file)
 	if err != nil {
 		log.Errorf("Error creating file %v", err)
@@ -298,7 +298,7 @@ func SplitYAML(file string) ([]string, error) {
 	scanner.Split(SplitFunc)
 	for scanner.Scan() {
 		splitData := scanner.Text()
-		logger.Printf("Split data : %s\n", splitData)
+		logger.Debugf("Split data : %s", splitData)
 
 		// Get split compose file name from split data
 		// If name isn't found, skip writing split data into a separate file

diff --git a/utils/pod/pod.go b/utils/pod/pod.go
@@ -286,8 +286,8 @@ func GetPorts(taskInfo *mesos.TaskInfo) *list.Element {
 			for _, r := range ranges.GetRange() {
 				begin := r.GetBegin()
 				end := r.GetEnd()
-				log.Println("Port Range : begin: ", begin)
-				log.Println("Port range : end: ", end)
+				log.Debug("Port Range : begin: ", begin)
+				log.Debug("Port range : end: ", end)
 				for i := begin; i < end+1; i++ {
 					ports.PushBack(i)
 				}