Watch for logs within subdirectories.

Signed-off-by: Saman Alvi <[email protected]>

file_watcher.go

@@ -57,24 +57,32 @@ func (f *fileWatcher) Watch() {
 				continue
 			}
 
-			logFiles, err := ioutil.ReadDir(tagDirPath)
-			if err != nil {
-				f.logger.Fatalf("could not list files in log dir %s: %s\n", tag, err)
-			}
+			f.findLogsToWatch(tag, tagDirPath, fileInfo)
+
+		}
 
-			for _, logFile := range logFiles {
-				if !strings.HasSuffix(logFile.Name(), ".log") {
-					continue
-				}
+		time.Sleep(POLL_INTERVAL)
+	}
+}
 
-				logFileFullPath := filepath.Join(tagDirPath, logFile.Name())
-				if _, found := f.dynamicGroupClient.Get(logFileFullPath); !found {
-					f.dynamicGroupClient.Inserter() <- f.memberForFile(logFileFullPath)
-				}
+func (f *fileWatcher) findLogsToWatch(tag string, filePath string, file os.FileInfo) {
+	if !file.IsDir() {
+		if strings.HasSuffix(file.Name(), ".log") {
+			if _, found := f.dynamicGroupClient.Get(filePath); !found {
+				f.dynamicGroupClient.Inserter() <- f.memberForFile(filePath)
 			}
 		}
+		return
+	}
 
-		time.Sleep(POLL_INTERVAL)
+	dirContents, err := ioutil.ReadDir(filePath)
+	if err != nil {
+		f.logger.Fatalf("could not list files in log dir %s: %s\n", tag, err)
+	}
+
+	for _, content := range dirContents {
+		currentFilePath := filepath.Join(filePath, content.Name())
+		f.findLogsToWatch(tag, currentFilePath, content)
 	}
 }
 

integration/syslog_test.go

@@ -332,13 +332,13 @@ var _ = Describe("Blackbox", func() {
 			Expect(message.Content).To(ContainSubstring(Hostname()))
 		})
 
-		It("ignores subdirectories in tag directories", func() {
-			err := os.Mkdir(filepath.Join(logDir, tagName, "ignore-me"), os.ModePerm)
+		It("does not ignore subdirectories in tag directories", func() {
+			err := os.Mkdir(filepath.Join(logDir, tagName, "do-not-ignore-me"), os.ModePerm)
 			Expect(err).NotTo(HaveOccurred())
 
-			err = ioutil.WriteFile(
-				filepath.Join(logDir, tagName, "ignore-me", "and-my-son.log"),
-				[]byte("some-data"),
+			childLog, err := os.OpenFile(
+				filepath.Join(logDir, tagName, "do-not-ignore-me", "and-my-son.log"),
+				os.O_WRONLY|os.O_CREATE|os.O_TRUNC,
 				os.ModePerm,
 			)
 			Expect(err).NotTo(HaveOccurred())
@@ -356,6 +356,15 @@ var _ = Describe("Blackbox", func() {
 			Expect(message.Content).To(ContainSubstring("test-tag"))
 			Expect(message.Content).To(ContainSubstring(Hostname()))
 
+			childLog.WriteString("child data\n")
+			childLog.Sync()
+			childLog.Close()
+
+			Eventually(inbox.Messages, "5s").Should(Receive(&message))
+			Expect(message.Content).To(ContainSubstring("child data"))
+			Expect(message.Content).To(ContainSubstring("test-tag"))
+			Expect(message.Content).To(ContainSubstring(Hostname()))
+
 			blackboxRunner.Stop()
 		})