6
6
"io/ioutil"
7
7
"log"
8
8
"net/http"
9
- "os"
9
+ "os"
10
10
"os/exec"
11
11
)
12
12
@@ -45,26 +45,27 @@ func loadConfig(configFile *string) {
45
45
}
46
46
47
47
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 )
54
54
}
55
55
56
56
func startWebserver () {
57
- log .Println ("starting webserver" )
57
+ log .Println ("starting webserver" )
58
58
http .ListenAndServe (":" + * port , nil )
59
59
}
60
60
61
61
func addHandler (repo , branch , shell string ) {
62
62
uri := branch
63
63
branch = "refs/heads/" + branch
64
64
http .HandleFunc ("/" + repo + "_" + uri , func (w http.ResponseWriter , r * http.Request ) {
65
- payload := r . FormValue ( "payload" )
65
+ decoder := json . NewDecoder ( r . Body )
66
66
var data GithubJson
67
- err := json .Unmarshal ([]byte (payload ), & data )
67
+ err := decoder .Decode (& data )
68
+
68
69
if err != nil {
69
70
log .Println (err )
70
71
}
@@ -85,15 +86,15 @@ func executeShell(shell string) {
85
86
var (
86
87
port = flag .String ("port" , "7654" , "port to listen on" )
87
88
configFile = flag .String ("config" , "./config.json" , "config" )
88
- logFile = flag .String ("log" , "./log" , "log file" )
89
+ logFile = flag .String ("log" , "./log" , "log file" )
89
90
)
90
91
91
92
func init () {
92
93
flag .Parse ()
93
94
}
94
95
95
96
func main () {
96
- setLog (logFile )
97
+ setLog (logFile )
97
98
loadConfig (configFile )
98
99
startWebserver ()
99
100
}
0 commit comments