Skip to content
This repository was archived by the owner on Sep 5, 2024. It is now read-only.

Commit 4e3f7ae

Browse files
committed
Merge pull request #6 from FraBle/json-unmarshal-fix
usage of json.Decoder instead of json.Unmarshal
2 parents 04f8925 + 8edf7e5 commit 4e3f7ae

File tree

1 file changed

+13
-12
lines changed

1 file changed

+13
-12
lines changed

main.go

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import (
66
"io/ioutil"
77
"log"
88
"net/http"
9-
"os"
9+
"os"
1010
"os/exec"
1111
)
1212

@@ -45,26 +45,27 @@ func loadConfig(configFile *string) {
4545
}
4646

4747
func setLog(logFile *string) {
48-
log_handler, err := os.OpenFile(*logFile, os.O_APPEND|os.O_WRONLY|os.O_CREATE, 0777)
49-
if err != nil {
50-
panic("cannot write log")
51-
}
52-
log.SetOutput(log_handler)
53-
log.SetFlags(5)
48+
log_handler, err := os.OpenFile(*logFile, os.O_APPEND|os.O_WRONLY|os.O_CREATE, 0777)
49+
if err != nil {
50+
panic("cannot write log")
51+
}
52+
log.SetOutput(log_handler)
53+
log.SetFlags(5)
5454
}
5555

5656
func startWebserver() {
57-
log.Println("starting webserver")
57+
log.Println("starting webserver")
5858
http.ListenAndServe(":"+*port, nil)
5959
}
6060

6161
func addHandler(repo, branch, shell string) {
6262
uri := branch
6363
branch = "refs/heads/" + branch
6464
http.HandleFunc("/"+repo+"_"+uri, func(w http.ResponseWriter, r *http.Request) {
65-
payload := r.FormValue("payload")
65+
decoder := json.NewDecoder(r.Body)
6666
var data GithubJson
67-
err := json.Unmarshal([]byte(payload), &data)
67+
err := decoder.Decode(&data)
68+
6869
if err != nil {
6970
log.Println(err)
7071
}
@@ -85,15 +86,15 @@ func executeShell(shell string) {
8586
var (
8687
port = flag.String("port", "7654", "port to listen on")
8788
configFile = flag.String("config", "./config.json", "config")
88-
logFile = flag.String("log", "./log", "log file")
89+
logFile = flag.String("log", "./log", "log file")
8990
)
9091

9192
func init() {
9293
flag.Parse()
9394
}
9495

9596
func main() {
96-
setLog(logFile)
97+
setLog(logFile)
9798
loadConfig(configFile)
9899
startWebserver()
99100
}

0 commit comments

Comments
 (0)