From b23215d09b373e509faf3f0be946ad528152a6d0 Mon Sep 17 00:00:00 2001 From: Alex Bramley Date: Sat, 4 Feb 2012 00:51:06 +0000 Subject: [PATCH] Gofix run. --- client/connection.go | 8 ++++---- client/line.go | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/client/connection.go b/client/connection.go index b91d335..98efbbc 100644 --- a/client/connection.go +++ b/client/connection.go @@ -6,8 +6,8 @@ import ( "errors" "fmt" "github.com/fluffle/goevent/event" - "github.com/fluffle/golog/logging" "github.com/fluffle/goirc/state" + "github.com/fluffle/golog/logging" "net" "strings" "time" @@ -228,7 +228,7 @@ func (conn *Conn) recv() { conn.l.Debug("<- %s", s) if line := parseLine(s); line != nil { - line.Time = time.LocalTime() + line.Time = time.Now() conn.in <- line } else { conn.l.Warn("irc.recv(): problems parsing line:\n %s", s) @@ -279,12 +279,12 @@ func (conn *Conn) rateLimit(chars int64) int64 { // Hybrid's algorithm allows for 2 seconds per line and an additional // 1/120 of a second per character on that line. linetime := 2*second + chars*second/120 - elapsed := time.Nanoseconds() - conn.lastsent + elapsed := time.Now().Sub(conn.lastsent) if conn.badness += linetime - elapsed; conn.badness < 0 { // negative badness times are badness... conn.badness = int64(0) } - conn.lastsent = time.Nanoseconds() + conn.lastsent = time.Now() // If we've sent more than 10 second's worth of lines according to the // calculation above, then we're at risk of "Excess Flood". if conn.badness > 10*second { diff --git a/client/line.go b/client/line.go index 789d3cc..706d373 100644 --- a/client/line.go +++ b/client/line.go @@ -14,7 +14,7 @@ type Line struct { Nick, Ident, Host, Src string Cmd, Raw string Args []string - Time *time.Time + Time time.Time } // NOTE: this doesn't copy l.Time (this should be read-only anyway)