mirror of
https://github.com/gohugoio/hugo.git
synced 2025-04-27 22:21:07 +03:00
Adding support for logging & verbose logging. Consolidation of error handling. Integration of jWalterWeatherman library. Fixed #137
This commit is contained in:
parent
2fa3761ec9
commit
e50b9d8ac1
15 changed files with 140 additions and 111 deletions
|
@ -15,11 +15,13 @@ package commands
|
|||
|
||||
import (
|
||||
"fmt"
|
||||
"github.com/spf13/cobra"
|
||||
"net/http"
|
||||
"os"
|
||||
"strconv"
|
||||
"strings"
|
||||
|
||||
"github.com/spf13/cobra"
|
||||
jww "github.com/spf13/jwalterweatherman"
|
||||
)
|
||||
|
||||
var serverPort int
|
||||
|
@ -62,7 +64,7 @@ func server(cmd *cobra.Command, args []string) {
|
|||
|
||||
// Watch runs its own server as part of the routine
|
||||
if serverWatch {
|
||||
fmt.Println("Watching for changes in", Config.GetAbsPath(Config.ContentDir))
|
||||
jww.FEEDBACK.Println("Watching for changes in", Config.GetAbsPath(Config.ContentDir))
|
||||
err := NewWatcher(serverPort)
|
||||
if err != nil {
|
||||
fmt.Println(err)
|
||||
|
@ -73,21 +75,19 @@ func server(cmd *cobra.Command, args []string) {
|
|||
}
|
||||
|
||||
func serve(port int) {
|
||||
if Verbose {
|
||||
fmt.Println("Serving pages from " + Config.GetAbsPath(Config.PublishDir))
|
||||
}
|
||||
jww.FEEDBACK.Println("Serving pages from " + Config.GetAbsPath(Config.PublishDir))
|
||||
|
||||
if BaseUrl == "" {
|
||||
fmt.Printf("Web Server is available at %s\n", Config.BaseUrl)
|
||||
jww.FEEDBACK.Printf("Web Server is available at %s\n", Config.BaseUrl)
|
||||
} else {
|
||||
fmt.Printf("Web Server is available at http://localhost:%v\n", port)
|
||||
jww.FEEDBACK.Printf("Web Server is available at http://localhost:%v\n", port)
|
||||
}
|
||||
|
||||
fmt.Println("Press ctrl+c to stop")
|
||||
|
||||
err := http.ListenAndServe(":"+strconv.Itoa(port), http.FileServer(http.Dir(Config.GetAbsPath(Config.PublishDir))))
|
||||
if err != nil {
|
||||
fmt.Fprintf(os.Stderr, "Error: %s\n", err.Error())
|
||||
jww.ERROR.Printf("Error: %s\n", err.Error())
|
||||
os.Exit(1)
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue