autopush@1446656177

funcs.go

@@ -18,11 +18,6 @@ import (
 	"github.com/fatih/structs"
 )
 
-////////////////////////////////////////////////////////////////////////////////
-func Inspect(args ...interface{}) {
-	spew.Dump(args)
-}
-
 func newFuncMap() map[string]interface{} {
 	m := make(map[string]interface{})
 	m["base"] = path.Base
@@ -35,14 +30,27 @@ func newFuncMap() map[string]interface{} {
 	m["join"] = strings.Join
 	m["atoi"] = strconv.Atoi
 	m["where"] = where
+	m["inspect"] = Inspect
 	m["datetime"] = time.Now
 	m["toUpper"] = strings.ToUpper
 	m["toLower"] = strings.ToLower
 	m["contains"] = strings.Contains
 	m["replace"] = strings.Replace
+	m["scratchGetMVal"] = scratchGetMapValue
+	m["scratchGetSVal"] = scratchGetSliceValue
+	m["scratchSet"] = scratchSet
+	m["scratchAdd"] = scratchAdd
+	m["scratchMNames"] = scratchMapNames
+	m["scratchSNames"] = scratchSliceNames
+
 	return m
 }
 
+////////////////////////////////////////////////////////////////////////////////
+func Inspect(args ...interface{}) {
+	spew.Dump(args)
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 func get(ctx interface{}, action string, args ...interface{}) (interface{}, error) {
 	method := reflect.ValueOf(ctx).MethodByName(action)

rmt.go

@@ -28,13 +28,6 @@ func createTemplateCtx(meta *metadata.Client) (interface{}, error) {
 	if err != nil {
 		return nil, errors.Annotate(err, "get services")
 	}
-
-	servicesW := make([]ServiceWrap, 0)
-	for _, service := range services {
-		sw := ServiceWrap{service}
-		servicesW = append(servicesW, sw)
-	}
-
 	containers, err := meta.GetContainers()
 	if err != nil {
 		return nil, errors.Annotate(err, "get containers")
@@ -46,6 +39,12 @@ func createTemplateCtx(meta *metadata.Client) (interface{}, error) {
 		containersW = append(containersW, cw)
 	}
 
+	servicesW := make([]ServiceWrap, 0)
+	for _, service := range services {
+		sw := ServiceWrap{service}
+		servicesW = append(servicesW, sw)
+	}
+
 	ctx := map[string]interface{}{
 		"Services":   servicesW,
 		"Containers": containersW,

scratch.go

@@ -0,0 +1,60 @@
+package main
+
+var scrtsMap = make(map[string]map[string]interface{})
+var scrtsSlice = make(map[string][]interface{})
+
+//////////////////////////////////////////////////////////////////////////////
+func scratchSet(scratch string, key string, value interface{}) {
+	if scr, ok := scrtsMap[scratch]; ok {
+		scr[key] = value
+	} else {
+		scrtsMap[scratch] = make(map[string]interface{})
+		scrtsMap[scratch][key] = value
+	}
+}
+
+//////////////////////////////////////////////////////////////////////////////
+func scratchAdd(scratch string, value interface{}) {
+	if scr, ok := scrtsSlice[scratch]; ok {
+		scr = append(scr, value)
+	} else {
+		scrtsSlice[scratch] = make([]interface{}, 0)
+		scrtsSlice[scratch] = append(scrtsSlice[scratch], value)
+	}
+}
+
+//////////////////////////////////////////////////////////////////////////////
+func scratchGetMapValue(scratch string, key string) interface{} {
+	if scr, ok := scrtsMap[scratch]; ok {
+		return scr[key]
+	}
+	return nil
+}
+
+//////////////////////////////////////////////////////////////////////////////
+func scratchGetSliceValue(scratch string, key string) []interface{} {
+	if scr, ok := scrtsSlice[scratch]; ok {
+		return scr
+	}
+	return nil
+}
+
+//////////////////////////////////////////////////////////////////////////////
+func scratchMapNames() []string {
+	nms := make([]string, 0)
+
+	for k, _ := range scrtsMap {
+		nms = append(nms, k)
+	}
+	return nms
+}
+
+//////////////////////////////////////////////////////////////////////////////
+func scratchSliceNames() []string {
+	nms := make([]string, 0)
+
+	for k, _ := range scrtsSlice {
+		nms = append(nms, k)
+	}
+	return nms
+}

wrap.go

@@ -24,7 +24,6 @@ func (p ContainerWrap) PortInternal(idx int) (string, error) {
 		return "", nil
 	}
 
-	Inspect(p.Ports)
 	if idx >= len(p.Ports) {
 		return "", errors.Errorf("PortInternal: index %d out of range", idx)
 	}
@@ -51,7 +50,7 @@ func (p ContainerWrap) LabelByKey(key string) (string, error) {
 		return val, nil
 	}
 
-	printWarning("LabelByKey: key %q is not found", key)
+	printDebug("LabelByKey: key %q is not found", key)
 	return "", nil
 }