Extracting some example middleware into seperate files

paulbellamy · paulbellamy · commit 7f43e5ed0691 · 2011-05-21T22:10:24.000+01:00
diff --git a/Makefile b/Makefile
@@ -5,6 +5,8 @@ GOFMT=gofmt
 
 GOFILES=\
 				mango.go\
+				logger.go\
+				show_errors.go\
 
 include $(GOROOT)/src/Make.pkg
 
diff --git a/logger.go b/logger.go
@@ -0,0 +1,12 @@
+package mango
+
+import (
+	"log"
+)
+
+func Logger(logger *log.Logger) Middleware {
+	return func(env Env, app App) (Status, Headers, Body) {
+		env["mango.logger"] = logger
+		return app(env)
+	}
+}
diff --git a/mango.go b/mango.go
@@ -1,13 +1,9 @@
 package mango
 
 import (
-	"bytes"
 	"fmt"
 	"http"
-	"log"
 	"os"
-	"strings"
-	"template"
 )
 
 type Env map[string]interface{}
@@ -95,53 +91,7 @@ func (this *Stack) Run(app App) os.Error {
 	if this.Address == "" {
 		this.Address = "0.0.0.0:8000"
 	}
-	log.Println("Starting Mango Stack On:", this.Address)
+	fmt.Println("Starting Mango Stack On: %s", this.Address)
 	http.HandleFunc("/", this.buildStack())
 	return http.ListenAndServe(this.Address, nil)
 }
-
-
-/*************************************
- * End Mango Source
- * Begin Example Usage
- ************************************/
-
-// An example of how to pass runtime config to Middleware
-func Logger(prefix string) Middleware {
-	return func(env Env, app App) (Status, Headers, Body) {
-		status, headers, body := app(env)
-		log.Println(prefix, env["mango.request"].(*http.Request).Method, env["mango.request"].(*http.Request).RawURL, status)
-		return status, headers, body
-	}
-}
-
-func ShowErrors(templateString string) Middleware {
-	if templateString == "" {
-		templateString = `
-      <html>
-      <body>
-        <p>
-          {Error|html}
-        </p>
-      </body>
-      </html>
-    `
-	}
-
-	errorTemplate := template.MustParse(templateString, nil)
-
-	return func(env Env, app App) (status Status, headers Headers, body Body) {
-		defer func() {
-			if err := recover(); err != nil {
-				log.Println("Error: ", err)
-				buffer := bytes.NewBufferString("")
-				errorTemplate.Execute(buffer, struct{ Error string }{err.(string)})
-				status = 500
-				headers = make(map[string]string)
-				body = Body(buffer.String())
-			}
-		}()
-
-		return app(env)
-	}
-}
diff --git a/show_errors.go b/show_errors.go
@@ -0,0 +1,36 @@
+package mango
+
+import (
+	"bytes"
+	"template"
+)
+
+func ShowErrors(templateString string) Middleware {
+	if templateString == "" {
+		templateString = `
+      <html>
+      <body>
+        <p>
+          {Error|html}
+        </p>
+      </body>
+      </html>
+    `
+	}
+
+	errorTemplate := template.MustParse(templateString, nil)
+
+	return func(env Env, app App) (status Status, headers Headers, body Body) {
+		defer func() {
+			if err := recover(); err != nil {
+				buffer := bytes.NewBufferString("")
+				errorTemplate.Execute(buffer, struct{ Error string }{err.(string)})
+				status = 500
+				headers = make(map[string]string)
+				body = Body(buffer.String())
+			}
+		}()
+
+		return app(env)
+	}
+}
