sad/soju
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Parse timestamp from message tags in messageLogger.Append

Browse Source
This commit is contained in:
Simon Ser 2020-04-08 10:18:51 +02:00
parent 9f6e59195c
commit 155f35bd84
No known key found for this signature in database
GPG Key ID: 0FDE7BE0E88F5E48
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
logger.go
View File

@ -41,12 +41,21 @@ func (ml *messageLogger) Append(msg *irc.Message) error {
return nil return nil
} }
// TODO: parse time from msg.Tags["time"], if available var t time.Time
if tag, ok := msg.Tags["time"]; ok {
var err error
t, err = time.Parse(serverTimeLayout, string(tag))
if err != nil {
return fmt.Errorf("failed to parse message time tag: %v", err)
}
t = t.In(time.Local)
} else {
t = time.Now()
}
// TODO: enforce maximum open file handles (LRU cache of file handles) // TODO: enforce maximum open file handles (LRU cache of file handles)
// TODO: handle non-monotonic clock behaviour // TODO: handle non-monotonic clock behaviour
now := time.Now() path := logPath(ml.network, ml.entity, t)
path := logPath(ml.network, ml.entity, now)
if ml.path != path { if ml.path != path {
if ml.file != nil { if ml.file != nil {
ml.file.Close() ml.file.Close()
@ -66,7 +75,7 @@ func (ml *messageLogger) Append(msg *irc.Message) error {
ml.file = f ml.file = f
} }
_, err := fmt.Fprintf(ml.file, "[%02d:%02d:%02d] %s\n", now.Hour(), now.Minute(), now.Second(), s) _, err := fmt.Fprintf(ml.file, "[%02d:%02d:%02d] %s\n", t.Hour(), t.Minute(), t.Second(), s)
if err != nil { if err != nil {
return fmt.Errorf("failed to log message to %q: %v", ml.path, err) return fmt.Errorf("failed to log message to %q: %v", ml.path, err)
} }