From b358b06311ecc464c16451e4037ff77a1f8483d3 Mon Sep 17 00:00:00 2001 From: Vishal Rana Date: Thu, 17 Nov 2016 16:21:41 -0800 Subject: [PATCH] updated docs, closes #735 Signed-off-by: Vishal Rana --- README.md | 5 +---- echo.go | 4 +--- recipe/cors/server.go | 4 +--- recipe/crud/server.go | 4 +--- recipe/embed-resources/server.go | 4 +--- recipe/file-upload/multiple/server.go | 4 +--- recipe/file-upload/single/server.go | 4 +--- recipe/google-app-engine/app-standalone.go | 4 +--- recipe/graceful-shutdown/server.go | 4 +--- recipe/hello-world/server.go | 4 +--- recipe/http2/server.go | 4 +--- recipe/jsonp/server.go | 4 +--- recipe/jwt/custom-claims/server.go | 4 +--- recipe/jwt/map-claims/server.go | 4 +--- recipe/middleware/server.go | 4 +--- recipe/streaming-response/server.go | 4 +--- recipe/subdomains/server.go | 4 +--- recipe/websocket/gorilla/server.go | 4 +--- recipe/websocket/net/server.go | 4 +--- website/content/guide/error-handling.md | 4 +--- website/content/index.md | 5 +---- 21 files changed, 21 insertions(+), 65 deletions(-) diff --git a/README.md b/README.md index 7036e7192..d119f6b26 100644 --- a/README.md +++ b/README.md @@ -48,10 +48,7 @@ func main() { e.GET("/", func(c echo.Context) error { return c.String(http.StatusOK, "Hello, World!") }) - - if err := e.Start(":1323"); err != nil { - e.Logger.Fatal(err.Error()) - } + e.Logger.Fatal(e.Start(":1323")) } ``` diff --git a/echo.go b/echo.go index 8b7836c15..cc251f85d 100644 --- a/echo.go +++ b/echo.go @@ -29,9 +29,7 @@ Example: e.GET("/", hello) // Start server - if err := e.Start(":1323"); err != nil { - e.Logger.Fatal(err) - } + e.Logger.Fatal(e.Start(":1323")) } Learn more at https://echo.labstack.com diff --git a/recipe/cors/server.go b/recipe/cors/server.go index bdd0a719f..0cc5c3450 100644 --- a/recipe/cors/server.go +++ b/recipe/cors/server.go @@ -34,7 +34,5 @@ func main() { e.GET("/api/users", getUsers) - if err := e.Start(":1323"); err != nil { - e.Logger.Fatal(err) - } + e.Logger.Fatal(e.Start(":1323")) } diff --git a/recipe/crud/server.go b/recipe/crud/server.go index 12188ac3c..fbb5c754e 100644 --- a/recipe/crud/server.go +++ b/recipe/crud/server.go @@ -71,7 +71,5 @@ func main() { e.DELETE("/users/:id", deleteUser) // Start server - if err := e.Start(":1323"); err != nil { - e.Logger.Fatal(err) - } + e.Logger.Fatal(e.Start(":1323")) } diff --git a/recipe/embed-resources/server.go b/recipe/embed-resources/server.go index 15512865a..e5b0c3db3 100644 --- a/recipe/embed-resources/server.go +++ b/recipe/embed-resources/server.go @@ -17,7 +17,5 @@ func main() { // servers other static files e.GET("/static/*", echo.WrapHandler(http.StripPrefix("/static/", assetHandler))) - if err := e.Start(":1323"); err != nil { - e.Logger.Fatal(err) - } + e.Logger.Fatal(e.Start(":1323")) } diff --git a/recipe/file-upload/multiple/server.go b/recipe/file-upload/multiple/server.go index 6f7639d0c..cd0f54d39 100644 --- a/recipe/file-upload/multiple/server.go +++ b/recipe/file-upload/multiple/server.go @@ -61,7 +61,5 @@ func main() { e.Static("/", "public") e.POST("/upload", upload) - if err := e.Start(":1323"); err != nil { - e.Logger.Fatal(err) - } + e.Logger.Fatal(e.Start(":1323")) } diff --git a/recipe/file-upload/single/server.go b/recipe/file-upload/single/server.go index 9693afa73..1b84f220e 100644 --- a/recipe/file-upload/single/server.go +++ b/recipe/file-upload/single/server.go @@ -55,7 +55,5 @@ func main() { e.Static("/", "public") e.POST("/upload", upload) - if err := e.Start(":1323"); err != nil { - e.Logger.Fatal(err) - } + e.Logger.Fatal(e.Start(":1323")) } diff --git a/recipe/google-app-engine/app-standalone.go b/recipe/google-app-engine/app-standalone.go index 6c8201d24..c3b44dc0f 100644 --- a/recipe/google-app-engine/app-standalone.go +++ b/recipe/google-app-engine/app-standalone.go @@ -20,7 +20,5 @@ func createMux() *echo.Echo { } func main() { - if err := e.Start(":8080"); err != nil { - e.Logger.Fatal(err) - } + e.Logger.Fatal(e.Start(":8080")) } diff --git a/recipe/graceful-shutdown/server.go b/recipe/graceful-shutdown/server.go index ee9edaf07..e8dff36e0 100644 --- a/recipe/graceful-shutdown/server.go +++ b/recipe/graceful-shutdown/server.go @@ -16,7 +16,5 @@ func main() { return ctx.String(200, "OK") }) - if err := e.Start(":1323"); err != nil { - e.Logger.Fatal(err) - } + e.Logger.Fatal(e.Start(":1323")) } diff --git a/recipe/hello-world/server.go b/recipe/hello-world/server.go index feb0d095d..06e0718b6 100644 --- a/recipe/hello-world/server.go +++ b/recipe/hello-world/server.go @@ -21,7 +21,5 @@ func main() { }) // Start server - if err := e.Start(":1323"); err != nil { - e.Logger.Fatal(err) - } + e.Logger.Fatal(e.Start(":1323")) } diff --git a/recipe/http2/server.go b/recipe/http2/server.go index 864fedcd1..8db989c49 100644 --- a/recipe/http2/server.go +++ b/recipe/http2/server.go @@ -38,7 +38,5 @@ func main() { e := echo.New() e.GET("/request", request) e.GET("/stream", stream) - if err := e.StartTLS(":1323", "cert.pem", "key.pem"); err != nil { - e.Logger.Fatal(err) - } + e.Logger.Fatal(e.StartTLS(":1323", "cert.pem", "key.pem")) } diff --git a/recipe/jsonp/server.go b/recipe/jsonp/server.go index ebe0ae7e7..ba46bab02 100644 --- a/recipe/jsonp/server.go +++ b/recipe/jsonp/server.go @@ -31,7 +31,5 @@ func main() { }) // Start server - if err := e.Start(":1323"); err != nil { - e.Logger.Fatal(err) - } + e.Logger.Fatal(e.Start(":1323")) } diff --git a/recipe/jwt/custom-claims/server.go b/recipe/jwt/custom-claims/server.go index 683a93107..52fc46154 100644 --- a/recipe/jwt/custom-claims/server.go +++ b/recipe/jwt/custom-claims/server.go @@ -82,7 +82,5 @@ func main() { r.Use(middleware.JWTWithConfig(config)) r.GET("", restricted) - if err := e.Start(":1323"); err != nil { - e.Logger.Fatal(err) - } + e.Logger.Fatal(e.Start(":1323")) } diff --git a/recipe/jwt/map-claims/server.go b/recipe/jwt/map-claims/server.go index b163cbf9a..678be490b 100644 --- a/recipe/jwt/map-claims/server.go +++ b/recipe/jwt/map-claims/server.go @@ -65,7 +65,5 @@ func main() { r.Use(middleware.JWT([]byte("secret"))) r.GET("", restricted) - if err := e.Start(":1323"); err != nil { - e.Logger.Fatal(err) - } + e.Logger.Fatal(e.Start(":1323")) } diff --git a/recipe/middleware/server.go b/recipe/middleware/server.go index 7218d2d3e..2f21df50b 100644 --- a/recipe/middleware/server.go +++ b/recipe/middleware/server.go @@ -78,7 +78,5 @@ func main() { }) // Start server - if err := e.Start(":1323"); err != nil { - e.Logger.Fatal(err) - } + e.Logger.Fatal(e.Start(":1323")) } diff --git a/recipe/streaming-response/server.go b/recipe/streaming-response/server.go index b80c55513..a3a679ef0 100644 --- a/recipe/streaming-response/server.go +++ b/recipe/streaming-response/server.go @@ -41,7 +41,5 @@ func main() { } return nil }) - if err := e.Start(":1323"); err != nil { - e.Logger.Fatal(err) - } + e.Logger.Fatal(e.Start(":1323")) } diff --git a/recipe/subdomains/server.go b/recipe/subdomains/server.go index 1b8e7fd80..ef4f65f9b 100644 --- a/recipe/subdomains/server.go +++ b/recipe/subdomains/server.go @@ -74,7 +74,5 @@ func main() { return }) - if err := e.Start(":1323"); err != nil { - e.Logger.Fatal(err) - } + e.Logger.Fatal(e.Start(":1323")) } diff --git a/recipe/websocket/gorilla/server.go b/recipe/websocket/gorilla/server.go index 2ef6d1472..e9d52dbba 100644 --- a/recipe/websocket/gorilla/server.go +++ b/recipe/websocket/gorilla/server.go @@ -43,7 +43,5 @@ func main() { e.Use(middleware.Recover()) e.Static("/", "../public") e.GET("/ws", hello) - if err := e.Start(":1323"); err != nil { - e.Logger.Fatal(err) - } + e.Logger.Fatal(e.Start(":1323")) } diff --git a/recipe/websocket/net/server.go b/recipe/websocket/net/server.go index a2f1516ac..aa7460306 100644 --- a/recipe/websocket/net/server.go +++ b/recipe/websocket/net/server.go @@ -37,7 +37,5 @@ func main() { e.Use(middleware.Recover()) e.Static("/", "../public") e.GET("/ws", hello) - if err := e.Start(":1323"); err != nil { - e.Logger.Fatal(err) - } + e.Logger.Fatal(e.Start(":1323")) } diff --git a/website/content/guide/error-handling.md b/website/content/guide/error-handling.md index 29aaa30e2..a15c70288 100644 --- a/website/content/guide/error-handling.md +++ b/website/content/guide/error-handling.md @@ -40,9 +40,7 @@ func main() { } }) e.GET("/", welcome) - if err := e.Start(":1323"); err != nil { - e.Logger.Fatal(err) - } + e.Logger.Fatal(e.Start(":1323")) } func welcome(c echo.Context) error { diff --git a/website/content/index.md b/website/content/index.md index 8faa967f4..70177e989 100644 --- a/website/content/index.md +++ b/website/content/index.md @@ -50,10 +50,7 @@ func main() { e.GET("/", func(c echo.Context) error { return c.String(http.StatusOK, "Hello, World!") }) - - if err := e.Start(":1323"); err != nil { - e.Logger.Fatal(err.Error()) - } + e.Logger.Fatal(e.Start(":1323")) } ```