fixed server reporting Web Server is available at https://localhost:1313 when server always serve http

This commit is contained in:
Marcelo Glezer 2014-10-17 13:32:16 -03:00 committed by spf13
parent 73ec09258b
commit 2b412d4ac7

View file

@ -110,8 +110,6 @@ func server(cmd *cobra.Command, args []string) {
func serve(port int) {
jww.FEEDBACK.Println("Serving pages from " + helpers.AbsPathify(viper.GetString("PublishDir")))
jww.FEEDBACK.Printf("Web Server is available at %s\n", viper.GetString("BaseUrl"))
fmt.Println("Press ctrl+c to stop")
httpFs := &afero.HttpFs{SourceFs: hugofs.DestinationFS}
fileserver := http.FileServer(httpFs.Dir(helpers.AbsPathify(viper.GetString("PublishDir"))))
@ -126,6 +124,10 @@ func serve(port int) {
http.Handle(u.Path+"/", http.StripPrefix(u.Path+"/", fileserver))
}
u.Scheme = "http"
jww.FEEDBACK.Printf("Web Server is available at %s\n", u.String())
fmt.Println("Press ctrl+c to stop")
err = http.ListenAndServe(":"+strconv.Itoa(port), nil)
if err != nil {
jww.ERROR.Printf("Error: %s\n", err.Error())