logger.UseLogFile을 houston의 자식 프로세스에도 적용

client/operation.go

@@ -272,6 +272,8 @@ func (hc *houstonClient) launch(meta *procmeta) error {
 		thisFileSize := 0
 		logFileIndex := 0
 
+		var logWriter func([]byte)
+		if *logger.UseLogFile {
 			logFileNamePrefix := makeLogFilePrefix(meta, index)
 			logFileName := fmt.Sprintf("%s_%d.log", logFileNamePrefix, logFileIndex)
 			targetFile, err := os.Create(logFileName)
@@ -297,6 +299,39 @@ func (hc *houstonClient) launch(meta *procmeta) error {
 				}
 			}()
 
+			logWriter = func(buff []byte) {
+				for written := 0; written < len(buff); {
+					n, err := targetFile.Write(buff)
+					if err != nil {
+						logger.Println("write log file failed :", logFileName, err)
+						break
+					} else {
+						written += n
+						thisFileSize += n
+					}
+				}
+
+				if thisFileSize > 5*1024*1024 {
+					logFileIndex++
+					logFileName = fmt.Sprintf("%s_%d.log", logFileNamePrefix, logFileIndex)
+					nextTargetFile, err := os.Create(logFileName)
+					if err != nil {
+						logger.Println("failed to create log file :", logFileName)
+					} else {
+						targetFile.Close()
+						targetFile = nextTargetFile
+						os.Remove(linkPath)
+						os.Symlink(path.Base(filepath.ToSlash(targetFile.Name())), linkPath)
+						thisFileSize = 0
+					}
+				}
+			}
+		} else {
+			logWriter = func(buff []byte) {
+				os.Stdout.Write(buff)
+			}
+		}
+
 		readingMetric := false
 		var metricBuffer []byte
 		defer func() {
@@ -362,31 +397,7 @@ func (hc *houstonClient) launch(meta *procmeta) error {
 				continue
 			}
 
-			for written := 0; written < len(buff); {
-				n, err := targetFile.Write(buff)
-				if err != nil {
-					logger.Println("write log file failed :", logFileName, err)
-					break
-				} else {
-					written += n
-					thisFileSize += n
-				}
-			}
-
-			if thisFileSize > 5*1024*1024 {
-				logFileIndex++
-				logFileName = fmt.Sprintf("%s_%d.log", logFileNamePrefix, logFileIndex)
-				nextTargetFile, err := os.Create(logFileName)
-				if err != nil {
-					logger.Println("failed to create log file :", logFileName)
-				} else {
-					targetFile.Close()
-					targetFile = nextTargetFile
-					os.Remove(linkPath)
-					os.Symlink(path.Base(filepath.ToSlash(targetFile.Name())), linkPath)
-					thisFileSize = 0
-				}
-			}
+			logWriter(buff)
 		}
 	}