Merge branch 'master' into support-git-tag

Author: sawanoboly

cmd/start.go

@@ -20,7 +20,10 @@ import (
 func Start(c *cli.Context) error {
 	log.Debug("Step: config.LoadFromFile")
 
-	serverid, err := util.GetServerID()
+	serverid, err := util.GetServerID(c.GlobalString("provider"))
+	if err != nil {
+		return err
+	}
 
 	conf, err := config.LoadFromFile(c.String("config"))
 	if err != nil {

cmd/update.go

@@ -17,7 +17,11 @@ import (
 )
 
 func Update(c *cli.Context) error {
-	serverid, err := util.GetServerID()
+	serverid, err := util.GetServerID(c.GlobalString("provider"))
+	if err != nil {
+		return err
+	}
+
 	conf, err := config.LoadFromFile(c.String("config"))
 	if err != nil {
 		return err

container/docker.go

@@ -302,7 +302,7 @@ func (d *Docker) containerCreate(name string, dir string, isApp bool) (*Containe
 
 // to keep compatibility with older modaemon
 func (d *Docker) prepareLogsDir() error {
-	if util.FileExists(containerLogsLocation) {
+	if util.FileExists(containerLogsLocation + "log") {
 		return nil
 	}
 

main.go

@@ -4,7 +4,6 @@ import (
 	"encoding/json"
 	"fmt"
 	"io"
-	"os"
 	"sort"
 	"strings"
 
@@ -33,6 +32,7 @@ func beforeActions(c *cli.Context) error {
 	if c.GlobalBool("autoupdate") {
 		versions.AutoUpdate(golatest())
 	}
+	log.Debugf("Set provider to %#v", c.GlobalString("provider"))
 	return nil
 }
 
@@ -70,6 +70,11 @@ func main() {
 			Name:  "autoupdate, U",
 			Usage: "auto update before run",
 		},
+		cli.StringFlag{
+			Name:  "provider, P",
+			Value: "aws",
+			Usage: "set `Provider`",
+		},
 	}
 
 	// Common Flags for commands
@@ -118,7 +123,7 @@ func main() {
 
 	sort.Sort(cli.FlagsByName(app.Flags))
 
-	app.Run(os.Args)
+	app.RunAndExitOnError()
 }
 
 // FatalWriter just initiaizes cliErrWriter

util/util.go

@@ -13,6 +13,7 @@ import (
 
 var (
 	ec2METAENDPOINT       = "http://169.254.169.254/"
+	ecsMETAENDPOINT       = "http://100.100.100.200/"
 	containerLogsLocation = "/var/modaemon/containerlogs"
 )
 
@@ -36,42 +37,44 @@ func FetchContainerState() string {
 	return strings.TrimSpace(string(dat))
 }
 
-func GetServerID(s ...string) (string, error) {
-	var sid string
-
-	if len(s) == 0 {
-		s = append(s, "aws")
-	}
-
-	switch s[0] {
-	case "aws":
-		sid = getServerIDforEC2()
-	default:
-		return sid, errors.New("Provider `" + s[0] + "` is not supported.")
+func GetServerID(s string) (string, error) {
+	sid, err := getServerID(s)
+	if err != nil {
+		return "", err
 	}
 
 	return sid, nil
 }
 
-func getServerIDforEC2() string {
+func getServerID(provider string) (string, error) {
 	timeout := time.Duration(5 * time.Second)
 	client := http.Client{
 		Timeout: timeout,
 	}
 
-	resp, err := client.Get(ec2METAENDPOINT + "/latest/meta-data/instance-id")
+	var endpoint string
+	switch provider {
+	case "aws":
+		endpoint = ec2METAENDPOINT + "/latest/meta-data/instance-id"
+	case "alicloud":
+		endpoint = ecsMETAENDPOINT + "/latest/meta-data/instance-id"
+	default:
+		return "", errors.New("Provider `" + provider + "` is not supported.")
+	}
+
+	resp, err := client.Get(endpoint)
 	if err != nil {
 		log.Warnf("%#v", err)
-		return ""
+		return "", errors.New("Failed to get ServerID")
 	}
 
 	defer resp.Body.Close()
 
 	body, err := ioutil.ReadAll(resp.Body)
 	if err != nil {
 		log.Warnf("%#v", err)
-		return ""
+		return "", errors.New("Failed to get ServerID")
 	}
 
-	return string(body)
+	return string(body), nil
 }