short code

gosuv.go

@@ -2,12 +2,15 @@ package main
 
 import (
 	"encoding/json"
+	"errors"
 	"fmt"
 	"io/ioutil"
 	"net/http"
+	"net/url"
 	"os"
 	"os/exec"
 	"path/filepath"
+	"strconv"
 	"strings"
 	"time"
 
@@ -130,7 +133,7 @@ func checkServerStatus() error {
 	var ret JSONResponse
 	err = json.Unmarshal(body, &ret)
 	if err != nil {
-		return err
+		return errors.New("json loads error: " + string(body))
 	}
 	if ret.Status != 0 {
 		return fmt.Errorf("%v", ret.Value)
@@ -148,41 +151,38 @@ func actionStatus(c *cli.Context) error {
 	return nil
 }
 
-func actionShutdown(c *cli.Context) error {
+func postForm(pathname string, data url.Values) (r JSONResponse, err error) {
-	restart := c.Bool("restart")
+	resp, err := http.PostForm(cfg.Client.ServerURL+pathname, data)
-	if restart {
-		log.Fatal("Restart not implemented.")
-	}
-	resp, err := http.Post(cfg.Client.ServerURL+"/api/shutdown", "application/x-www-form-urlencoded", nil)
 	if err != nil {
-		log.Fatal(err)
+		return r, err
 	}
 	defer resp.Body.Close()
 	body, err := ioutil.ReadAll(resp.Body)
 	if err != nil {
-		log.Fatal(err)
+		return r, err
 	}
-	var ret JSONResponse
+	err = json.Unmarshal(body, &r)
-	err = json.Unmarshal(body, &ret)
 	if err != nil {
-		log.Fatal(err)
+		return r, fmt.Errorf("POST %v %v", strconv.Quote(pathname), string(body))
 	}
-	fmt.Println(ret.Value)
+	return r, nil
-	return nil
 }
 
-func actionReload(c *cli.Context) error {
+func actionShutdown(c *cli.Context) error {
-	resp, err := http.Post(cfg.Client.ServerURL+"/api/reload", "application/x-www-form-urlencoded", nil)
+	restart := c.Bool("restart")
-	if err != nil {
+	if restart {
-		log.Fatal(err)
+		log.Fatal("Restart not implemented.")
 	}
-	defer resp.Body.Close()
+	ret, err := postForm("/api/shutdown", nil)
-	body, err := ioutil.ReadAll(resp.Body)
 	if err != nil {
 		log.Fatal(err)
 	}
-	var ret JSONResponse
+	fmt.Println(ret.Value)
-	err = json.Unmarshal(body, &ret)
+	return nil
+}
+
+func actionReload(c *cli.Context) error {
+	ret, err := postForm("/api/reloads", nil)
 	if err != nil {
 		log.Fatal(err)
 	}