Mirrors/go-inbucket
1
0
Fork 0
mirror of https://github.com/jhillyerd/inbucket.git synced 2025-12-17 09:37:02 +00:00
Code Issues Releases Wiki Activity

More config cleanups for #86

Browse Source
This commit is contained in:
James Hillyerd
2018-03-22 20:02:34 -07:00
parent 845cbedc0d
commit f0a94f4848
7 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/server/pop3/handler.go
View File

@@ -496,7 +496,7 @@ func (ses *Session) sendMessageTop(msg storage.Message, lineCount int) {
// Load the users mailbox
func (ses *Session) loadMailbox() {
m, err := ses.server.dataStore.GetMessages(ses.user)
m, err := ses.server.store.GetMessages(ses.user)
if err != nil {
ses.logError("Failed to load messages for %v: %v", ses.user, err)
}
@@ -522,7 +522,7 @@ func (ses *Session) processDeletes() {
for i, msg := range ses.messages {
if !ses.retain[i] {
ses.logTrace("Deleting %v", msg)
if err := ses.server.dataStore.RemoveMessage(ses.user, msg.ID()); err != nil {
if err := ses.server.store.RemoveMessage(ses.user, msg.ID()); err != nil {
ses.logWarn("Error deleting %v: %v", msg, err)
}
}
@@ -536,7 +536,7 @@ func (ses *Session) enterState(state State) {
// Calculate the next read or write deadline based on maxIdleSeconds
func (ses *Session) nextDeadline() time.Time {
return time.Now().Add(ses.server.maxIdle)
return time.Now().Add(ses.server.timeout)
}
// Send requested message, store errors in Session.sendError