added file logging

Author: jaredwilkening

logger/logger.go

@@ -0,0 +1,78 @@
+package logger
+
+import (
+	"fmt"
+	"github.com/MG-RAST/Shock/conf"
+	l4g "github.com/jaredwilkening/log4go"
+	"os"
+)
+
+//type level int
+
+type m struct {
+	log     string
+	lvl     l4g.Level
+	message string
+}
+
+type Logger struct {
+	queue chan m
+	logs  map[string]l4g.Logger
+}
+
+func New() *Logger {
+	l := &Logger{queue: make(chan m, 1024), logs: map[string]l4g.Logger{}}
+	l.logs["access"] = make(l4g.Logger)
+	accessf := l4g.NewFileLogWriter(conf.LOGSPATH+"/access.log", false)
+	if accessf == nil {
+		fmt.Fprintln(os.Stderr, "ERROR: error creating access log file")
+		os.Exit(1)
+	}
+	l.logs["access"].AddFilter("access", l4g.FINEST, accessf.SetFormat("[%D %T] %M").SetRotate(true).SetRotateDaily(true))
+
+	l.logs["error"] = make(l4g.Logger)
+	errorf := l4g.NewFileLogWriter(conf.LOGSPATH+"/error.log", false)
+	if errorf == nil {
+		fmt.Fprintln(os.Stderr, "ERROR: error creating error log file")
+		os.Exit(1)
+	}
+	l.logs["error"].AddFilter("error", l4g.FINEST, errorf.SetFormat("[%D %T] [%L] %M").SetRotate(true).SetRotateDaily(true))
+	return l
+}
+
+func (l *Logger) Handle() {
+	for {
+		m := <-l.queue
+		l.logs[m.log].Log(m.lvl, "", m.message)
+	}
+}
+
+func (l *Logger) Log(log string, lvl l4g.Level, message string) {
+	l.queue <- m{log: log, lvl: lvl, message: message}
+	return
+}
+
+func (l *Logger) Debug(log string, message string) {
+	l.Log(log, l4g.DEBUG, message)
+	return
+}
+
+func (l *Logger) Warning(log string, message string) {
+	l.Log(log, l4g.WARNING, message)
+	return
+}
+
+func (l *Logger) Info(log string, message string) {
+	l.Log(log, l4g.INFO, message)
+	return
+}
+
+func (l *Logger) Error(log string, message string) {
+	l.Log(log, l4g.ERROR, message)
+	return
+}
+
+func (l *Logger) Critical(log string, message string) {
+	l.Log(log, l4g.CRITICAL, message)
+	return
+}

shock-server/shock-server.go

@@ -3,63 +3,70 @@ package main
 import (
 	"fmt"
 	"github.com/MG-RAST/Shock/conf"
+	"github.com/MG-RAST/Shock/logger"
 	"github.com/jaredwilkening/goweb"
 	"os"
 )
 
+var (
+	log = logger.New()
+)
+
+func launchSite(control chan int, port int) {
+	goweb.ConfigureDefaultFormatters()
+	r := &goweb.RouteManager{}
+	r.MapFunc("/raw", RawDir)
+	r.MapFunc("/assets", AssetsDir)
+	r.MapFunc("*", Site)
+	err := goweb.ListenAndServeRoutes(fmt.Sprintf(":%d", conf.SITEPORT), r)
+	if err != nil {
+		fmt.Fprintf(os.Stderr, "ERROR: site: %v\n", err)
+	}
+	control <- 1 //we are ending
+}
+
+func launchAPI(control chan int, port int) {
+	goweb.ConfigureDefaultFormatters()
+	r := &goweb.RouteManager{}
+	r.MapRest("/node", new(NodeController))
+	r.MapRest("/user", new(UserController))
+	r.MapFunc("*", ResourceDescription, goweb.GetMethod)
+	err := goweb.ListenAndServeRoutes(fmt.Sprintf(":%d", port), r)
+	if err != nil {
+		fmt.Fprintf(os.Stderr, "ERROR: api: %v\n", err)
+	}
+	control <- 1 //we are ending
+}
+
 func main() {
-	fmt.Printf("%s\n######### Conf #########\ndata-root:\t%s\nmongodb:\t%s\nsecretkey:\t%s\nsite-port:\t%d\napi-port:\t%d\n\n",
+	fmt.Printf("%s\n######### Conf #########\ndata-root:\t%s\naccess-log:\t%s\nerror-log:\t%s\nmongodb:\t%s\nsecretkey:\t%s\nsite-port:\t%d\napi-port:\t%d\n\n####### Anonymous ######\nread:\t%t\nwrite:\t%t\ncreate-user:\t%t\n\n",
 		logo,
 		conf.DATAPATH,
+		conf.LOGSPATH+"/access.log",
+		conf.LOGSPATH+"/error.log",
 		conf.MONGODB,
 		conf.SECRETKEY,
 		conf.SITEPORT,
 		conf.APIPORT,
+		conf.ANONREAD,
+		conf.ANONWRITE,
+		conf.ANONCREATEUSER,
 	)
+
+	// reload
 	if conf.RELOAD != "" {
 		fmt.Println("####### Reloading #######")
 		err := reload(conf.RELOAD)
 		if err != nil {
 			fmt.Fprintf(os.Stderr, "ERROR: %v\n", err)
-		} else {
-			fmt.Println("Done")
 		}
-	} else {
-		fmt.Println("####### Starting #######")
-		c := make(chan int)
-		goweb.ConfigureDefaultFormatters()
-		// start site
-		go func() {
-			r := &goweb.RouteManager{}
-			r.MapFunc("/raw", RawDir)
-			r.MapFunc("/assets", AssetsDir)
-			r.MapFunc("*", Site)
-			c <- 1
-			err := goweb.ListenAndServeRoutes(fmt.Sprintf(":%d", conf.SITEPORT), r)
-			if err != nil {
-				fmt.Fprintf(os.Stderr, "ERROR: unable to start site: %v\n", err)
-			}
-			c <- 1
-		}()
-		<-c
-		fmt.Printf("site :%d... running\n", conf.SITEPORT)
-
-		// start api
-		go func() {
-			r := &goweb.RouteManager{}
-			r.MapRest("/node", new(NodeController))
-			r.MapRest("/user", new(UserController))
-			r.MapFunc("*", ResourceDescription, goweb.GetMethod)
-			c <- 1
-			err := goweb.ListenAndServeRoutes(fmt.Sprintf(":%d", conf.APIPORT), r)
-			if err != nil {
-				fmt.Fprintf(os.Stderr, "ERROR: unable to start api: %v\n", err)
-			}
-			c <- 1
-		}()
-		<-c
-		fmt.Printf("api  :%d... running\n", conf.APIPORT)
-		fmt.Printf("\n######### Log  #########\n")
-		<-c
+		fmt.Println("Done")
 	}
+
+	//launch server
+	control := make(chan int)
+	go log.Handle()
+	go launchSite(control, conf.SITEPORT)
+	go launchAPI(control, conf.APIPORT)
+	<-control //block till something dies
 }

shock-server/util.go

@@ -18,7 +18,6 @@ import (
 	"net/http"
 	"os"
 	"strings"
-	"time"
 )
 
 var (
@@ -237,18 +236,17 @@ func LogRequest(req *http.Request) {
 	// failed attempt to get the host in ipv4
 	//addrs, _ := net.LookupIP(host)	
 	//fmt.Println(addrs)
-	prefix := fmt.Sprintf("%s [%s]", host, time.Now().Format(time.RFC1123))
 	suffix := ""
 	if _, auth := req.Header["Authorization"]; auth {
-		suffix = "AUTH"
+		suffix = " AUTH"
 	}
 	url := ""
 	if req.URL.RawQuery != "" {
 		url = fmt.Sprintf("%s %s?%s", req.Method, req.URL.Path, req.URL.RawQuery)
 	} else {
 		url = fmt.Sprintf("%s %s", req.Method, req.URL.Path)
 	}
-	fmt.Printf("%s %q %s\n", prefix, url, suffix)
+	log.Info("access", host+" \""+url+suffix+"\"")
 }
 
 func AuthenticateRequest(req *http.Request) (u *user.User, err error) {