mirrors/seaweedfs
1
0
Fork 0
mirror of https://github.com/chrislusf/seaweedfs synced 2024-06-29 05:41:02 +02:00
Code Issues Projects Releases Wiki Activity

non blocking audit log

Browse source
This commit is contained in:
Konstantin Lebedev 2021-12-09 19:47:16 +05:00
parent 40ee9b4d7b
commit 98251fe16a
3 changed files with 27 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
weed/command/s3.go
View file

@ -198,6 +198,7 @@ func (s3opt *S3Options) startS3Server() bool {
if len(*s3opt.auditLogConfig) > 0 { if len(*s3opt.auditLogConfig) > 0 {
s3err.InitAuditLog(*s3opt.auditLogConfig) s3err.InitAuditLog(*s3opt.auditLogConfig)
} }
defer s3err.Logger.Close()
if *s3opt.tlsPrivateKey != "" { if *s3opt.tlsPrivateKey != "" {
glog.V(0).Infof("Start Seaweed S3 API Server %s at https port %d", util.Version(), *s3opt.port) glog.V(0).Infof("Start Seaweed S3 API Server %s at https port %d", util.Version(), *s3opt.port)

2
weed/s3api/s3api_object_handlers.go
View file

@ -261,7 +261,7 @@ func (s3a *S3ApiServer) DeleteMultipleObjectsHandler(w http.ResponseWriter, r *h
} }
if auditLog != nil { if auditLog != nil {
auditLog.Key = entryName auditLog.Key = entryName
s3err.PostAccessLog(auditLog) go s3err.PostAccessLog(*auditLog)
} }
} }

42
weed/s3api/s3err/audit_fluent.go
View file

@ -48,23 +48,29 @@ type AccessLogHTTP struct {
const tag = "s3.access" const tag = "s3.access"
var ( var (
Logger *fluent.Fluent Logger *fluent.Fluent
hostname = os.Getenv("HOSTNAME") hostname = os.Getenv("HOSTNAME")
environment = os.Getenv("ENVIRONMENT")
fluentConfig *fluent.Config
) )
func InitAuditLog(config string) { func InitAuditLog(config string) {
configContent, readErr := os.ReadFile(config) configContent, readErr := os.ReadFile(config)
if readErr != nil { if readErr != nil {
glog.Fatalf("fail to read fluent config %s : %v", config, readErr) glog.Errorf("fail to read fluent config %s : %v", config, readErr)
return
} }
var fluentConfig fluent.Config if err := json.Unmarshal(configContent, fluentConfig); err != nil {
if err := json.Unmarshal(configContent, &fluentConfig); err != nil { glog.Errorf("fail to parse fluent config %s : %v", config, err)
glog.Fatalf("fail to parse fluent config %s : %v", config, err) return
}
if len(fluentConfig.TagPrefix) == 0 && len(environment) > 0 {
fluentConfig.TagPrefix = environment
} }
var err error var err error
Logger, err = fluent.New(fluentConfig) Logger, err = fluent.New(*fluentConfig)
if err != nil { if err != nil {
glog.Fatalf("fail to load fluent config: %v", err) glog.Errorf("fail to load fluent config: %v", err)
} }
} }
@ -131,16 +137,16 @@ func GetAccessLog(r *http.Request, HTTPStatusCode int, s3errCode ErrorCode) *Acc
if len(remoteIP) == 0 { if len(remoteIP) == 0 {
remoteIP = r.RemoteAddr remoteIP = r.RemoteAddr
} }
hostHeader := r.Header.Get("Host") hostHeader := r.Header.Get("X-Forwarded-Host")
if len(hostHeader) == 0 { if len(hostHeader) == 0 {
hostHeader = r.URL.Hostname() hostHeader = r.Host
} }
return &AccessLog{ return &AccessLog{
HostHeader: hostHeader, HostHeader: hostHeader,
RequestID: r.Header.Get("X-Request-ID"), RequestID: r.Header.Get("X-Request-ID"),
RemoteIP: remoteIP, RemoteIP: remoteIP,
Requester: r.Header.Get(xhttp.AmzIdentityId), Requester: r.Header.Get(xhttp.AmzIdentityId),
UserAgent: r.Header.Get("UserAgent"), UserAgent: r.Header.Get("user-agent"),
HostId: hostname, HostId: hostname,
Bucket: bucket, Bucket: bucket,
HTTPStatus: HTTPStatusCode, HTTPStatus: HTTPStatusCode,
@ -155,16 +161,18 @@ func PostLog(r *http.Request, HTTPStatusCode int, errorCode ErrorCode) {
if Logger == nil { if Logger == nil {
return return
} }
if err := Logger.Post(tag, *GetAccessLog(r, HTTPStatusCode, errorCode)); err != nil { go func(log *AccessLog) {
glog.Warning("Error while posting log: ", err) if err := Logger.Post(tag, *log); err != nil {
} glog.Warning("Error while posting log: ", err)
}
}(GetAccessLog(r, HTTPStatusCode, errorCode))
} }
func PostAccessLog(log *AccessLog) { func PostAccessLog(log AccessLog) {
if Logger == nil || log == nil { if Logger == nil || len(log.Key) == 0 {
return return
} }
if err := Logger.Post(tag, *log); err != nil { if err := Logger.Post(tag, log); err != nil {
glog.Warning("Error while posting log: ", err) glog.Warning("Error while posting log: ", err)
} }
} }