Browse Source

adjust logging

pull/1287/head
Chris Lu 5 years ago
parent
commit
c22094d340
  1. 21
      weed/filer2/filer_notify.go
  2. 2
      weed/filer2/filer_notify_append.go

21
weed/filer2/filer_notify.go

@ -15,18 +15,18 @@ import (
) )
func (f *Filer) NotifyUpdateEvent(oldEntry, newEntry *Entry, deleteChunks bool) { func (f *Filer) NotifyUpdateEvent(oldEntry, newEntry *Entry, deleteChunks bool) {
var key string
var fullpath string
if oldEntry != nil { if oldEntry != nil {
key = string(oldEntry.FullPath)
fullpath = string(oldEntry.FullPath)
} else if newEntry != nil { } else if newEntry != nil {
key = string(newEntry.FullPath)
fullpath = string(newEntry.FullPath)
} else { } else {
return return
} }
println("key:", key)
// println("fullpath:", fullpath)
if strings.HasPrefix(key, "/.meta") {
if strings.HasPrefix(fullpath, "/.meta") {
return return
} }
@ -42,15 +42,18 @@ func (f *Filer) NotifyUpdateEvent(oldEntry, newEntry *Entry, deleteChunks bool)
} }
if notification.Queue != nil { if notification.Queue != nil {
glog.V(3).Infof("notifying entry update %v", key)
notification.Queue.SendMessage(key, eventNotification)
glog.V(3).Infof("notifying entry update %v", fullpath)
notification.Queue.SendMessage(fullpath, eventNotification)
} }
f.logMetaEvent(time.Now(), key, eventNotification)
f.logMetaEvent(time.Now(), fullpath, eventNotification)
} }
func (f *Filer) logMetaEvent(ts time.Time, dir string, eventNotification *filer_pb.EventNotification) {
func (f *Filer) logMetaEvent(ts time.Time, fullpath string, eventNotification *filer_pb.EventNotification) {
dir, _ := util.FullPath(fullpath).DirAndName()
event := &filer_pb.FullEventNotification{ event := &filer_pb.FullEventNotification{
Directory: dir, Directory: dir,
EventNotification: eventNotification, EventNotification: eventNotification,

2
weed/filer2/filer_notify_append.go

@ -31,7 +31,7 @@ func (f *Filer) appendToFile(targetFile string, data []byte) error {
if err != nil { if err != nil {
return fmt.Errorf("upload data %s: %v", targetUrl, err) return fmt.Errorf("upload data %s: %v", targetUrl, err)
} }
println("uploaded to", targetUrl)
// println("uploaded to", targetUrl)
// find out existing entry // find out existing entry
fullpath := util.FullPath(targetFile) fullpath := util.FullPath(targetFile)

Loading…
Cancel
Save