Merge pull request #50 from coderbirju/update-logrotate

remove max file size check in openExistingOrNew

Author: fahedouch

logrotate.go

@@ -136,7 +136,7 @@ func (l *Logger) Write(p []byte) (n int, err error) {
 	}
 
 	if l.file == nil {
-		if err = l.openExistingOrNew(len(p)); err != nil {
+		if err = l.openExistingOrNew(); err != nil {
 			return 0, err
 		}
 	}
@@ -269,10 +269,9 @@ func (l *Logger) backupName(name, nameTimeFormat string, local bool) (string, er
 	return filepath.Join(dir, filename), nil
 }
 
-// openExistingOrNew opens the logfile if it exists and if the current write
-// would not put it over MaxBytes.  If there is no such file or the write would
-// put it over the MaxBytes, a new file is created.
-func (l *Logger) openExistingOrNew(writeLen int) error {
+// openExistingOrNew opens the logfile if it exists.
+// If there is no such file a new file is created.
+func (l *Logger) openExistingOrNew() error {
 	l.millRun()
 
 	filename := l.filename()
@@ -284,10 +283,6 @@ func (l *Logger) openExistingOrNew(writeLen int) error {
 		return fmt.Errorf("error getting log file info: %s", err)
 	}
 
-	if info.Size()+int64(writeLen) >= l.max(int64(writeLen)) {
-		return l.rotate()
-	}
-
 	file, err := os.OpenFile(filename, os.O_APPEND|os.O_WRONLY, 0644)
 	if err != nil {
 		// if we fail to open the old log file for some reason, just ignore

logrotate_test.go

@@ -78,6 +78,44 @@ func TestOpenExisting(t *testing.T) {
 	fileCount(dir, 1, t)
 }
 
+func TestOpenExistingOrNew(t *testing.T) {
+	dir := makeTempDir("TestOpenExistingOrNew", t)
+	defer os.RemoveAll(dir)
+
+	filename := logFile(dir)
+	l := &Logger{
+		Filename: filename,
+		MaxBytes: 100,
+	}
+
+	// File doesn't exist
+	err := l.openExistingOrNew()
+	isNil(err, t)
+	assert(l.file != nil, t, "Expected file to be opened")
+	equals(int64(0), l.size, t)
+
+	content := []byte("Hello, World!")
+	_, err = l.file.Write(content)
+	isNil(err, t)
+	l.size = int64(len(content))
+
+	// Close
+	err = l.file.Close()
+	isNil(err, t)
+	l.file = nil
+
+	// File exists and is not over MaxBytes
+	err = l.openExistingOrNew()
+	isNil(err, t)
+	assert(l.file != nil, t, "Expected file to be opened")
+	equals(int64(len(content)), l.size, t)
+
+	// Close
+	err = l.file.Close()
+	isNil(err, t)
+	l.file = nil
+}
+
 func TestWriteTooLong(t *testing.T) {
 	currentTime = fakeTime
 	dir := makeTempDir("TestWriteTooLong", t)