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

Logging and unit test changes

Browse Source 
Logging methods were renamed so they don't trigger go-vet warnings for
error() and Error() formatting.

Unit tests were updated to use new github.com/stretchr repo (was renamed
from stretchrcom)

Missing methods were added to Message mock object.
This commit is contained in:
James Hillyerd
2013-09-13 14:06:57 -07:00
parent f50061ac82
commit 2e78e4e6f7
16 changed files with 180 additions and 171 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
smtpd/filestore.go
View File

@@ -46,11 +46,11 @@ type FileDataStore struct {
func NewFileDataStore() DataStore {
path, err := config.Config.String("datastore", "path")
if err != nil {
log.Error("Error getting datastore path: %v", err)
log.LogError("Error getting datastore path: %v", err)
return nil
}
if path == "" {
log.Error("No value configured for datastore path")
log.LogError("No value configured for datastore path")
return nil
}
mailPath := filepath.Join(path, "mail")
@@ -66,7 +66,7 @@ func (ds *FileDataStore) MailboxFor(emailAddress string) (Mailbox, error) {
s2 := dir[0:6]
path := filepath.Join(ds.mailPath, s1, s2, dir)
if err := os.MkdirAll(path, 0770); err != nil {
log.Error("Failed to create directory %v, %v", path, err)
log.LogError("Failed to create directory %v, %v", path, err)
return nil, err
}
return &FileMailbox{store: ds, name: name, dirName: dir, path: path}, nil
@@ -132,7 +132,7 @@ func (mb *FileMailbox) GetMessages() ([]Message, error) {
if err != nil {
return nil, err
}
log.Trace("Scanning %v files for %v", len(files), mb)
log.LogTrace("Scanning %v files for %v", len(files), mb)
messages := make([]Message, 0, len(files))
for _, f := range files {
@@ -149,7 +149,7 @@ func (mb *FileMailbox) GetMessages() ([]Message, error) {
}
file.Close()
msg.mailbox = mb
log.Trace("Found: %v", msg)
log.LogTrace("Found: %v", msg)
messages = append(messages, msg)
}
}
@@ -170,7 +170,7 @@ func (mb *FileMailbox) GetMessage(id string) (Message, error) {
}
file.Close()
msg.mailbox = mb
log.Trace("Found: %v", msg)
log.LogTrace("Found: %v", msg)
return msg, nil
}
@@ -335,7 +335,7 @@ func (m *FileMessage) Close() error {
err := m.createGob()
if err != nil {
log.Error("Failed to create gob: %v", err)
log.LogError("Failed to create gob: %v", err)
return err
}
@@ -344,12 +344,12 @@ func (m *FileMessage) Close() error {
// Delete this Message from disk by removing both the gob and raw files
func (m *FileMessage) Delete() error {
log.Trace("Deleting %v", m.gobPath())
log.LogTrace("Deleting %v", m.gobPath())
err := os.Remove(m.gobPath())
if err != nil {
return err
}
log.Trace("Deleting %v", m.rawPath())
log.LogTrace("Deleting %v", m.rawPath())
return os.Remove(m.rawPath())
}