Implemented the Log package for logging

This commit is contained in:
Leon Baker
2015-06-16 12:34:30 +02:00
parent 8746179952
commit 882ca25f76
2 changed files with 89 additions and 74 deletions

View File

@@ -7,7 +7,8 @@ Copyright (c) 2015 Leon Baker
package main
import (
"fmt"
"log"
"os"
m "github.com/leonrbaker/gomilter"
)
@@ -22,11 +23,13 @@ type T struct {
C string
}
var logger *log.Logger
// Define the callback functions we are going to use
func (milter *Mymilter) Connect(ctx uintptr, hostname, ip string) (sfsistat int8) {
fmt.Println("mymilter.Connect was called")
fmt.Printf("hostname: %s\n", hostname)
fmt.Printf("ip: %s\n", ip)
logger.Println("mymilter.Connect was called")
logger.Printf("hostname: %s\n", hostname)
logger.Printf("ip: %s\n", ip)
t := T{1, hostname, "Test"}
m.SetPriv(ctx, &t)
@@ -35,53 +38,53 @@ func (milter *Mymilter) Connect(ctx uintptr, hostname, ip string) (sfsistat int8
}
func (milter *Mymilter) Helo(ctx uintptr, helohost string) (sfsistat int8) {
fmt.Println("mymilter.Helo was called")
fmt.Printf("helohost: %s\n", helohost)
logger.Println("mymilter.Helo was called")
logger.Printf("helohost: %s\n", helohost)
return
}
func (milter *Mymilter) EnvFrom(ctx uintptr, myargv []string) (sfsistat int8) {
fmt.Println("mymilter.EnvFrom was called")
fmt.Printf("myargv: %s\n", myargv)
logger.Println("mymilter.EnvFrom was called")
logger.Printf("myargv: %s\n", myargv)
// Show the value of a symbol
fmt.Printf("{mail_addr}: %v\n", m.GetSymVal(ctx, "{mail_addr}"))
logger.Printf("{mail_addr}: %v\n", m.GetSymVal(ctx, "{mail_addr}"))
return
}
func (milter *Mymilter) EnvRcpt(ctx uintptr, myargv []string) (sfsistat int8) {
fmt.Println("mymilter.EnvRcpt was called")
fmt.Printf("myargv: %s\n", myargv)
logger.Println("mymilter.EnvRcpt was called")
logger.Printf("myargv: %s\n", myargv)
// Show the value of a symbol
fmt.Printf("{rcpt_addr}: %v\n", m.GetSymVal(ctx, "{rcpt_addr}"))
logger.Printf("{rcpt_addr}: %v\n", m.GetSymVal(ctx, "{rcpt_addr}"))
return
}
func (milter *Mymilter) Header(ctx uintptr, headerf, headerv string) (sfsistat int8) {
fmt.Println("mymilter.Header was called")
fmt.Printf("header field: %s\n", headerf)
fmt.Printf("header value: %s\n", headerv)
logger.Println("mymilter.Header was called")
logger.Printf("header field: %s\n", headerf)
logger.Printf("header value: %s\n", headerv)
return
}
func (milter *Mymilter) Eoh(ctx uintptr) (sfsistat int8) {
fmt.Println("mymilter.Eoh was called")
logger.Println("mymilter.Eoh was called")
return
}
func (milter *Mymilter) Body(ctx uintptr, body []byte) (sfsistat int8) {
// Be careful as a conversion of body to string will make a copy of body
fmt.Println("mymilter.Body was called")
fmt.Println(string(body))
fmt.Printf("Body Length: %d\n", len(body))
logger.Println("mymilter.Body was called")
logger.Println(string(body))
logger.Printf("Body Length: %d\n", len(body))
return
}
func (milter *Mymilter) Eom(ctx uintptr) (sfsistat int8) {
fmt.Println("mymilter.Eom was called")
logger.Println("mymilter.Eom was called")
var t T
fmt.Println("m.GetPri:", m.GetPriv(ctx, &t))
fmt.Println("t:", t)
logger.Println("m.GetPri:", m.GetPriv(ctx, &t))
logger.Println("t:", t)
m.AddHeader(ctx, "LEONUX-Mailer",
"test server;\n\ttest1=\"foobar\"")
@@ -92,19 +95,23 @@ func (milter *Mymilter) Eom(ctx uintptr) (sfsistat int8) {
}
func (milter *Mymilter) Abort(ctx uintptr) (sfsistat int8) {
fmt.Println("mymilter.Abort was called")
logger.Println("mymilter.Abort was called")
return
}
func (milter *Mymilter) Close(ctx uintptr) (sfsistat int8) {
fmt.Println("mymilter.Close was called")
logger.Println("mymilter.Close was called")
return
}
func main() {
mymilter := new(Mymilter)
mymilter.FilterName = "TestFilter"
logger = log.New(os.Stdout, "", log.LstdFlags)
mymilter.Logger = logger
mymilter.Debug = true
mymilter.Flags = m.ADDHDRS | m.ADDRCPT | m.CHGFROM | m.CHGBODY
mymilter.Socket = "unix:/var/milterattachcheck/socket"