Skip to content

Commit 2a8d4bd

Browse files
cicoscalecicoscale
committed
Sync from Bitbucket
1 parent 7d1fc31 commit 2a8d4bd

File tree

9 files changed

+142
-130
lines changed

9 files changed

+142
-130
lines changed

‎src/coscale/api/api.go‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ package api
33
import (
44
"bytes"
55
"fmt"
6+
"math"
67
//"sync"
78
"encoding/json"
89
"errors"
@@ -20,6 +21,7 @@ type Object interface {
2021

2122
const (
2223
DEFAULT_STRING_VALUE string = `!>dUmmy<!`
24+
DEFAULT_INT64_VALUE int64 = math.MinInt64
2325
)
2426

2527
const (
@@ -52,7 +54,7 @@ func (re RequestError) Error() string {
5254
}
5355

5456
func (d Duplicate) Error() string {
55-
return fmt.Sprintf("Duplicate with id %v", d)
57+
return fmt.Sprintf("Duplicate with id %d", d)
5658
}
5759

5860
func (d Disabled) Error() string {

‎src/coscale/api/event.go‎

Lines changed: 19 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,13 @@ func (e Event) GetId() int64 {
1919

2020
// EventData describes the event data uploaded to api
2121
type EventData struct {
22-
ID int64
23-
Timestamp int64
24-
Stoptime int64
25-
Message string
26-
Attribute string
27-
Subject string
28-
Version int64
22+
ID int64
23+
Timestamp int64
24+
Stoptime int64
25+
Message string
26+
Attribute string
27+
Subject string
28+
Version int64
2929
UpdateTime int64
3030
}
3131

@@ -86,25 +86,32 @@ func (api *Api) InsertEventData(id int64, message, subject, attribute string, ti
8686
data := map[string][]string{
8787
"message": {message},
8888
"timestamp": {fmt.Sprintf("%d", timestamp)},
89-
"stopTime": {fmt.Sprintf("%d", stopTime)},
9089
"subject": {subject},
9190
"attribute": {attribute},
9291
}
92+
// add stoptime only if is set
93+
if stopTime != DEFAULT_INT64_VALUE {
94+
data["stopTime"] = []string{fmt.Sprintf("%d", stopTime)}
95+
}
96+
9397
var result string
9498
if err := api.makeCall("POST", fmt.Sprintf("/api/v1/app/%s/events/%d/data/", api.appID, id), data, true, &result); err != nil {
9599
return "", err
96100
}
97101
return result, nil
98102
}
99103

100-
func (api *Api) UpdateEventData(eventId, eventdataId int64, eventData *EventData) (string, error) {
104+
func (api *Api) UpdateEventData(eventId, eventdataId int64, eventData *EventData) (string, error) {
101105
data := map[string][]string{
102106
"message": {eventData.Message},
103107
"timestamp": {fmt.Sprintf("%d", eventData.Timestamp)},
104-
"stopTime": {fmt.Sprintf("%d", eventData.Stoptime)},
105108
"subject": {eventData.Subject},
106109
"attribute": {eventData.Attribute},
107-
"version": {fmt.Sprintf("%d", eventData.Version)},
110+
"version": {fmt.Sprintf("%d", eventData.Version)},
111+
}
112+
// add stoptime only if is set
113+
if eventData.Stoptime != DEFAULT_INT64_VALUE {
114+
data["stopTime"] = []string{fmt.Sprintf("%d", eventData.Stoptime)}
108115
}
109116
var result string
110117
if err := api.makeCall("PUT", fmt.Sprintf("/api/v1/app/%s/events/%d/data/%d/", api.appID, eventId, eventData.ID), data, true, &result); err != nil {
@@ -119,4 +126,4 @@ func (api *Api) DeleteEventData(eventId, eventdataId int64) error {
119126
return err
120127
}
121128
return nil
122-
}
129+
}

‎src/coscale/command/alert.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,11 @@ Optional:
2424
Run: func(cmd *Command, args []string) {
2525
var filter string
2626
cmd.Flag.Usage = func() { cmd.PrintUsage() }
27-
cmd.Flag.StringVar(&filter, "filter", DEFAULT_FLAG_VALUE, "List actions filtered by unresolved or by unacknowledged.")
27+
cmd.Flag.StringVar(&filter, "filter", DEFAULT_STRING_FLAG_VALUE, "List actions filtered by unresolved or by unacknowledged.")
2828
cmd.ParseArgs(args)
2929

3030
switch filter {
31-
case DEFAULT_FLAG_VALUE:
31+
case DEFAULT_STRING_FLAG_VALUE:
3232
cmd.PrintResult(cmd.Capi.GetObjects(alertObjectName))
3333
case "unresolved":
3434
cmd.PrintResult(cmd.Capi.GetAlertsBy("selectByResolved"))

‎src/coscale/command/command.go‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@ import (
1919
)
2020

2121
const (
22-
DEFAULT_FLAG_VALUE string = api.DEFAULT_STRING_VALUE
22+
DEFAULT_STRING_FLAG_VALUE string = api.DEFAULT_STRING_VALUE
23+
DEFAULT_INT64_FLAG_VALUE int64 = api.DEFAULT_INT64_VALUE
2324
)
2425

2526
const (
@@ -34,7 +35,7 @@ type Command struct {
3435
Name string
3536
UsageLine string
3637
Long string
37-
Deprecated bool
38+
Deprecated bool
3839
SubCommands []*Command
3940
Capi *api.Api //api connector
4041
Flag flag.FlagSet

‎src/coscale/command/common.go‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -39,13 +39,13 @@ Only one of them is necessary to be specified
3939
var name string
4040
var id int64
4141
cmd.Flag.Usage = func() { cmd.PrintUsage() }
42-
cmd.Flag.StringVar(&name, "name", DEFAULT_FLAG_VALUE, "Name for the object")
42+
cmd.Flag.StringVar(&name, "name", DEFAULT_STRING_FLAG_VALUE, "Name for the object")
4343
cmd.Flag.Int64Var(&id, "id", -1, "Unique identifier")
4444
cmd.ParseArgs(args)
4545

4646
if id != -1 {
4747
cmd.PrintResult(cmd.Capi.GetObject(objectName, id))
48-
} else if name != DEFAULT_FLAG_VALUE {
48+
} else if name != DEFAULT_STRING_FLAG_VALUE {
4949
cmd.PrintResult(cmd.Capi.GetObjectByName(objectName, name))
5050
} else {
5151
cmd.PrintUsage()
@@ -73,14 +73,14 @@ Only one of them is necessary to be specified
7373
var name string
7474
var id int64
7575
cmd.Flag.Usage = func() { cmd.PrintUsage() }
76-
cmd.Flag.StringVar(&name, "name", DEFAULT_FLAG_VALUE, "Name for the object")
76+
cmd.Flag.StringVar(&name, "name", DEFAULT_STRING_FLAG_VALUE, "Name for the object")
7777
cmd.Flag.Int64Var(&id, "id", -1, "Unique identifier")
7878
cmd.ParseArgs(args)
7979

8080
var err error
8181
if id != -1 {
8282
err = cmd.Capi.GetObjectRef(objectName, id, object)
83-
} else if name != DEFAULT_FLAG_VALUE {
83+
} else if name != DEFAULT_STRING_FLAG_VALUE {
8484
err = cmd.Capi.GetObejctRefByName(objectName, name, object)
8585
} else {
8686
cmd.PrintUsage()
@@ -121,14 +121,14 @@ Mandatory:
121121
cmd.Flag.Usage = func() { cmd.PrintUsage() }
122122
cmd.Flag.Int64Var(&idGroup, "idGroup", -1, "")
123123
cmd.Flag.Int64Var(&idObject, fmt.Sprintf("id%s", capitalize(objectName)), -1, "")
124-
cmd.Flag.StringVar(&nameGroup, "nameGroup", DEFAULT_FLAG_VALUE, "")
125-
cmd.Flag.StringVar(&nameObject, fmt.Sprintf("name%s", capitalize(objectName)), DEFAULT_FLAG_VALUE, "")
124+
cmd.Flag.StringVar(&nameGroup, "nameGroup", DEFAULT_STRING_FLAG_VALUE, "")
125+
cmd.Flag.StringVar(&nameObject, fmt.Sprintf("name%s", capitalize(objectName)), DEFAULT_STRING_FLAG_VALUE, "")
126126
cmd.ParseArgs(args)
127127

128128
var err error
129129
if idObject != -1 {
130130
err = cmd.Capi.GetObjectRef(objectName, idObject, object)
131-
} else if nameObject != DEFAULT_FLAG_VALUE {
131+
} else if nameObject != DEFAULT_STRING_FLAG_VALUE {
132132
err = cmd.Capi.GetObejctRefByName(objectName, nameObject, object)
133133
} else {
134134
cmd.PrintUsage()
@@ -139,7 +139,7 @@ Mandatory:
139139
}
140140
if idGroup != -1 {
141141
err = cmd.Capi.GetObjectRef(fmt.Sprintf("%sgroup", objectName), idGroup, group)
142-
} else if nameObject != DEFAULT_FLAG_VALUE {
142+
} else if nameObject != DEFAULT_STRING_FLAG_VALUE {
143143
err = cmd.Capi.GetObejctRefByName(fmt.Sprintf("%sgroup", objectName), nameObject, group)
144144
} else {
145145
cmd.PrintUsage()
@@ -180,14 +180,14 @@ Mandatory:
180180
cmd.Flag.Usage = func() { cmd.PrintUsage() }
181181
cmd.Flag.Int64Var(&idGroup, "idGroup", -1, "")
182182
cmd.Flag.Int64Var(&idObject, fmt.Sprintf("id%s", capitalize(objectName)), -1, "")
183-
cmd.Flag.StringVar(&nameGroup, "nameGroup", DEFAULT_FLAG_VALUE, "")
184-
cmd.Flag.StringVar(&nameObject, fmt.Sprintf("name%s", capitalize(objectName)), DEFAULT_FLAG_VALUE, "")
183+
cmd.Flag.StringVar(&nameGroup, "nameGroup", DEFAULT_STRING_FLAG_VALUE, "")
184+
cmd.Flag.StringVar(&nameObject, fmt.Sprintf("name%s", capitalize(objectName)), DEFAULT_STRING_FLAG_VALUE, "")
185185
cmd.ParseArgs(args)
186186

187187
var err error
188188
if idObject != -1 {
189189
err = cmd.Capi.GetObjectRef(objectName, idObject, object)
190-
} else if nameObject != DEFAULT_FLAG_VALUE {
190+
} else if nameObject != DEFAULT_STRING_FLAG_VALUE {
191191
err = cmd.Capi.GetObejctRefByName(objectName, nameObject, object)
192192
} else {
193193
cmd.PrintUsage()
@@ -198,7 +198,7 @@ Mandatory:
198198
}
199199
if idGroup != -1 {
200200
err = cmd.Capi.GetObjectRef(fmt.Sprintf("%sgroup", objectName), idGroup, group)
201-
} else if nameObject != DEFAULT_FLAG_VALUE {
201+
} else if nameObject != DEFAULT_STRING_FLAG_VALUE {
202202
err = cmd.Capi.GetObejctRefByName(fmt.Sprintf("%sgroup", objectName), nameObject, group)
203203
} else {
204204
cmd.PrintUsage()

‎src/coscale/command/data.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,11 @@ Optional:
3939
cmd.Flag.Int64Var(&id, "id", -1, "Unique identifier for metric.")
4040
cmd.Flag.IntVar(&start, "start", 0, "The start timestamp in seconds ago.")
4141
cmd.Flag.IntVar(&stop, "stop", 0, "The stop timestamp in seconds ago.")
42-
cmd.Flag.StringVar(&subjectIds, "subjectIds", DEFAULT_FLAG_VALUE, "The subject string")
42+
cmd.Flag.StringVar(&subjectIds, "subjectIds", DEFAULT_STRING_FLAG_VALUE, "The subject string")
4343
cmd.Flag.StringVar(&aggregator, "aggregator", "AVG", "The data aggregator (AVG, MIN, MAX).")
4444
cmd.Flag.BoolVar(&aggregateSubjects, "aggregateSubjects", false, "Boolean that indicates if the aggregated value over all subjectIds should be returned.")
4545
cmd.ParseArgs(args)
46-
if subjectIds == DEFAULT_FLAG_VALUE || id == -1 {
46+
if subjectIds == DEFAULT_STRING_FLAG_VALUE || id == -1 {
4747
cmd.PrintUsage()
4848
os.Exit(EXIT_FLAG_ERROR)
4949
}
@@ -91,17 +91,17 @@ Deprecated:
9191

9292
cmd.Flag.Usage = func() { cmd.PrintUsage() }
9393

94-
cmd.Flag.StringVar(&datapoint, "datapoint", DEFAULT_FLAG_VALUE, "")
95-
cmd.Flag.StringVar(&data, "data", DEFAULT_FLAG_VALUE, "")
94+
cmd.Flag.StringVar(&datapoint, "datapoint", DEFAULT_STRING_FLAG_VALUE, "")
95+
cmd.Flag.StringVar(&data, "data", DEFAULT_STRING_FLAG_VALUE, "")
9696
cmd.ParseArgs(args)
9797

98-
if datapoint == DEFAULT_FLAG_VALUE && data == DEFAULT_FLAG_VALUE {
98+
if datapoint == DEFAULT_STRING_FLAG_VALUE && data == DEFAULT_STRING_FLAG_VALUE {
9999
cmd.PrintUsage()
100100
os.Exit(EXIT_FLAG_ERROR)
101101
}
102102

103103
timeInSecAgo := false
104-
if data == DEFAULT_FLAG_VALUE {
104+
if data == DEFAULT_STRING_FLAG_VALUE {
105105
timeInSecAgo = true
106106
data = datapoint
107107
}

0 commit comments

Comments
 (0)