Commit c9d0758f authored by Kirill Smelkov's avatar Kirill Smelkov

go: Minor changes in the code to follow code conventions

Merge fixes to code formatting and naming as reported by gofmt and
golint from Gabriel.

see: kirr/helloweb!1
parents 0487fa7b 63f6d9d3
......@@ -4,74 +4,70 @@
package main
import (
"os"
"fmt"
"time"
"log"
"flag"
"strings"
"net"
"net/http"
"flag"
"fmt"
"log"
"net"
"net/http"
"os"
"strings"
"time"
)
func asctime() string {
return time.Now().Format(time.ANSIC)
return time.Now().Format(time.ANSIC)
}
// wrapper for http.Handler to log all requests
func logit(handler http.Handler) http.Handler {
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
log.Printf("%s %s %s", r.RemoteAddr, r.Method, r.URL)
handler.ServeHTTP(w, r)
})
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
log.Printf("%s %s %s", r.RemoteAddr, r.Method, r.URL)
handler.ServeHTTP(w, r)
})
}
var name string
func webhello(w http.ResponseWriter, r *http.Request) {
fmt.Fprintf(w, "Hello %s at `%s` ; %s (go)", name,
r.URL.Path, asctime())
fmt.Fprintf(w, "Hello %s at `%s` ; %s (go)", name,
r.URL.Path, asctime())
}
func main() {
logfile := flag.String("logfile", "", "log output to file instead of stderr")
flag.Usage = func() {
fmt.Println("Usage: helloweb.go [options] bind_ip bind_port ...")
flag.PrintDefaults()
}
flag.Parse()
if flag.NArg() < 2 {
flag.Usage()
os.Exit(1)
}
bind_ip := flag.Arg(0)
bind_port := flag.Arg(1)
bind_addr := net.JoinHostPort(bind_ip, bind_port)
name = strings.Join(flag.Args()[2:], " ")
if name == "" {
name = "world"
}
// redirect log to file, if requested
if *logfile != "" {
f, err := os.OpenFile(*logfile, os.O_RDWR | os.O_CREATE | os.O_APPEND, 0644)
if err != nil {
panic(err)
}
defer f.Close()
log.SetOutput(f)
}
log.Printf("* %s helloweb.go starting at %s", asctime(), bind_addr)
http.HandleFunc("/", webhello)
log.Fatal(
http.ListenAndServe(bind_addr, logit(http.DefaultServeMux)))
logfile := flag.String("logfile", "", "log output to file instead of stderr")
flag.Usage = func() {
fmt.Println("Usage: helloweb.go [options] bindIP bindPort ...")
flag.PrintDefaults()
}
flag.Parse()
if flag.NArg() < 2 {
flag.Usage()
os.Exit(1)
}
bindIP := flag.Arg(0)
bindPort := flag.Arg(1)
bindAddr := net.JoinHostPort(bindIP, bindPort)
name = strings.Join(flag.Args()[2:], " ")
if name == "" {
name = "world"
}
// redirect log to file, if requested
if *logfile != "" {
f, err := os.OpenFile(*logfile, os.O_RDWR|os.O_CREATE|os.O_APPEND, 0644)
if err != nil {
panic(err)
}
defer f.Close()
log.SetOutput(f)
}
log.Printf("* %s helloweb.go starting at %s", asctime(), bindAddr)
http.HandleFunc("/", webhello)
log.Fatal(
http.ListenAndServe(bindAddr, logit(http.DefaultServeMux)))
}
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment