add handling for log files that do not exist at the time of adding a …

…watch

errors.go

@@ -15,6 +15,8 @@ func (es ErrorState) String() string {
  return "Unknown"
  case ErrorStateEndOfStream:
  return "End of stream"
+ case ErrorStateFileNotExist:
+ return "File does not exist"
  case ErrorStateFileRemoved:
  return "File removed"
  case ErrorStateCancelled:
@@ -37,6 +39,7 @@ const (
  ErrorStateCancelled
  ErrorStateFSWatcher
  ErrorStateFilePath
+ ErrorStateFileNotExist
  ErrorStateFileRemoved
  ErrorStateFileIO
  ErrorStateEndOfStream

internal/version/VERSION

@@ -1 +1 @@
-v0.3.1
+v0.4.0

logfile.go

@@ -11,6 +11,8 @@ import (
  "time"
 )
 
+// stateEventOp is a type that represents a state event operation.
+// Used to communicate state events to the data processor.
 type stateEventOp uint8
 
 func (so stateEventOp) String() string {
@@ -95,12 +97,13 @@ func (lf *logFile) dataProcessor(ctx context.Context, ewCancelChan <-chan error,
 
  if fi != nil && fi.IsDir() {
  stopChan <- lf.filePath
- lf.errorChan <- NewLogWhaleError(ErrorStateFilePath, fmt.Sprintf("filepath (%s) is a directory, must be a file", lf.filePath), nil)
+ lf.errorChan <- NewLogWhaleError(ErrorStateFilePath, fmt.Sprintf("filepath (%s) is a directory and must be a file", lf.filePath), nil)
  return
  }
 
  // If the file doesn't exist, wait for it to be created
  if !lf.created {
+ lf.errorChan <- NewLogWhaleError(ErrorStateFileNotExist, fmt.Sprintf("file does not exist: %s", lf.filePath), nil)
  select {
  case <-ctx.Done():
  return
@@ -184,7 +187,7 @@ func (lf *logFile) dataProcessor(ctx context.Context, ewCancelChan <-chan error,
  return
  case so := <-lf.stateEvents:
  if so == stateEventRemoved {
- lf.errorChan <- NewLogWhaleError(ErrorStateFileRemoved, fmt.Sprintf("file removed, waiting for creation: %s", lf.filePath), nil)
+ lf.errorChan <- NewLogWhaleError(ErrorStateFileRemoved, fmt.Sprintf("file removed: %s", lf.filePath), nil)
  lf.created = false
  of.Close()
  continue creationLoop

logmanager_test.go

@@ -132,7 +132,24 @@ func (s *LogManagerTestSuite) TestRemoveLogFile() {
  time.Sleep(100 * time.Millisecond)
  select {
  case err := <-errorChan:
- s.Equal(fmt.Sprintf("state: File removed msg: file removed, waiting for creation: %s", of.Name()), err.Error())
+ s.Equal(fmt.Sprintf("state: File removed msg: file removed: %s", of.Name()), err.Error())
+ default:
+ s.Fail("expected error, got none")
+ }
+}
+
+func (s *LogManagerTestSuite) TestFileNotExist() {
+ fp := os.TempDir() + "doesnotexist"
+
+ _, errorChan, err := s.lm.AddLogFile(fp)
+ s.NoError(err)
+
+ time.Sleep(100 * time.Millisecond)
+ select {
+ case err := <-errorChan:
+ s.Equal(fmt.Sprintf("state: File does not exist msg: file does not exist: %s", fp), err.Error())
+ default:
+ s.Fail("expected error, got none")
  }
 }