Opportunistically try re-opening file audit fd on error (#2999)

Addresses a pain point from #2863 (comment)
hashicorp · Jul 14, 2017 · ba64932 · ba64932
1 parent e2fee08
commit ba64932
Showing 1 changed file with 24 additions and 0 deletions.
diff --git a/builtin/audit/file/backend.go b/builtin/audit/file/backend.go
@@ -159,6 +159,18 @@ func (b *Backend) LogRequest(auth *logical.Auth, req *logical.Request, outerErr
 		return err
 	}
 
+	if err := b.formatter.FormatRequest(b.f, b.formatConfig, auth, req, outerErr); err == nil {
+		return nil
+	}
+
+	// Opportunistically try to re-open the FD, once per call
+	b.f.Close()
+	b.f = nil
+
+	if err := b.open(); err != nil {
+		return err
+	}
+
 	return b.formatter.FormatRequest(b.f, b.formatConfig, auth, req, outerErr)
 }
 
@@ -175,6 +187,18 @@ func (b *Backend) LogResponse(
 		return err
 	}
 
+	if err := b.formatter.FormatResponse(b.f, b.formatConfig, auth, req, resp, err); err == nil {
+		return nil
+	}
+
+	// Opportunistically try to re-open the FD, once per call
+	b.f.Close()
+	b.f = nil
+
+	if err := b.open(); err != nil {
+		return err
+	}
+
 	return b.formatter.FormatResponse(b.f, b.formatConfig, auth, req, resp, err)
 }