change headers

Author: kshvakov

local/bin/sender.go

@@ -38,26 +38,24 @@ var client http.Client
 
 func send(commit Commit) error {
 
-	//data, _ := json.Marshal(push)
-
-	data, _ := json.MarshalIndent(commit, "  ", "  ")
-
-	fmt.Println(string(data))
+	data, _ := json.Marshal(commit)
 
 	_url := url.URL{
-		Scheme: "http",
-		Host:   os.Getenv("API_HOST"),
+		Scheme: os.Getenv("SCHEME"),
+		Host:   os.Getenv("HOST"),
 		Path:   "/web-hooks/native/",
 	}
 
 	req, _ := http.NewRequest("POST", _url.String(), bytes.NewReader(data))
 
 	req.Header.Set("X-Event", "commit")
-	req.Header.Set("X-Repository", os.Getenv("REPOSITORY"))
-	req.Header.Set("Content-Type", "application/x-www-form-urlencoded")
+	req.Header.Set("X-Token", os.Getenv("TOKEN"))
+	req.Header.Set("Content-Type", "application/json")
 
 	if _, err := client.Do(req); err != nil {
 
+		fmt.Printf("Error when sending a commit to Postgres-CI (err: %v)\n", err)
+
 		return nil
 	}
 

local/post-commit.sample

@@ -1,7 +1,7 @@
 #!/bin/bash
 
-
-export API_HOST=127.0.0.1:8080
-export REPOSITORY=5e28989ba11491
+export SCHEME=http
+export HOST=127.0.0.1:8080
+export TOKEN=5e28989ba11491
 
 $(pwd)/.git/hooks/bin/sender

server-side/bin/sender.go

@@ -60,26 +60,24 @@ var client http.Client
 
 func send(push git.Push) error {
 
-	//data, _ := json.Marshal(push)
-
-	data, _ := json.MarshalIndent(push, "  ", "  ")
-
-	fmt.Println(string(data))
+	data, _ := json.Marshal(push)
 
 	_url := url.URL{
-		Scheme: "http",
-		Host:   os.Getenv("API_HOST"),
+		Scheme: os.Getenv("SCHEME"),
+		Host:   os.Getenv("HOST"),
 		Path:   "/web-hooks/native/",
 	}
 
 	req, _ := http.NewRequest("POST", _url.String(), bytes.NewReader(data))
 
 	req.Header.Set("X-Event", "push")
-	req.Header.Set("X-Repository", os.Getenv("REPOSITORY"))
-	req.Header.Set("Content-Type", "application/x-www-form-urlencoded")
+	req.Header.Set("X-Token", os.Getenv("TOKEN"))
+	req.Header.Set("Content-Type", "application/json")
 
 	if _, err := client.Do(req); err != nil {
 
+		fmt.Printf("Error when sending a commit to Postgres-CI (err: %v)\n", err)
+
 		return nil
 	}
 

server-side/post-receive.sample

@@ -1,7 +1,8 @@
 #!/bin/bash
 
 
-export API_HOST=127.0.0.1:8080
-export REPOSITORY=5e28989ba11491
+export SCHEME=http
+export HOST=127.0.0.1:8080
+export TOKEN=5e28989ba11491
 
 ./hooks/bin/sender