Skip to content

Commit 7a17a94

Browse files
committed
Prevent echoing of response from function
- reduces verbosity Signed-off-by: Alex Ellis (VMware) <[email protected]>
1 parent 13cb26d commit 7a17a94

File tree

3 files changed

+23
-9
lines changed

3 files changed

+23
-9
lines changed

main.go

Lines changed: 19 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ func main() {
6060

6161
config := types.ControllerConfig{
6262
GatewayURL: os.Getenv("OPENFAAS_URL"),
63-
PrintResponse: true,
63+
PrintResponse: false,
6464
RebuildInterval: time.Second * 10,
6565
UpstreamTimeout: time.Second * 15,
6666
}
@@ -95,10 +95,10 @@ func bindEvents(c *vim25.Client, controller *types.Controller) error {
9595
cancel()
9696
}
9797
}()
98+
<-ctx.Done()
99+
// done := make(chan bool)
98100

99-
done := make(chan bool)
100-
101-
<-done
101+
// <-done
102102

103103
// controller.Invoke()
104104

@@ -129,6 +129,12 @@ func makeRecv(controller *types.Controller, m *event.Manager) func(managedObject
129129
func handleEvent(event vtypes.BaseEvent, m *event.Manager) (string, string, error) {
130130
eventType := reflect.TypeOf(event).Elem().Name()
131131

132+
gotEvent := event.GetEvent()
133+
if gotEvent.Vm != nil {
134+
log.Printf("VM: %s", gotEvent.Vm.Vm.Reference().String())
135+
}
136+
log.Printf("UserName: %s", gotEvent.UserName)
137+
132138
category, err := m.EventCategory(context.Background(), event)
133139
if err != nil {
134140
return "", "", errors.Wrap(err, "error retrieving event category")
@@ -139,16 +145,21 @@ func handleEvent(event vtypes.BaseEvent, m *event.Manager) (string, string, erro
139145
topic := convertToTopic(eventType)
140146

141147
message, _ := json.Marshal(OutboundEvent{
142-
Topic: topic,
143-
Category: category,
148+
Topic: topic,
149+
Category: category,
150+
CreatedTime: gotEvent.CreatedTime,
151+
UserName: gotEvent.UserName,
144152
})
145153

146154
return topic, string(message), nil
147155
}
148156

149157
type OutboundEvent struct {
150-
Topic string
151-
Category string
158+
Topic string `json:"topic,omitempty"`
159+
Category string `json:"category,omitempty"`
160+
161+
UserName string `json:"userName,omitempty"`
162+
CreatedTime time.Time `json:"createdTime,omitempty"`
152163
}
153164

154165
func newVCenterClient(ctx context.Context, vcenterURL string, insecure bool) (*govmomi.Client, error) {

vendor/github.com/openfaas-incubator/connector-sdk/types/controller.go

Lines changed: 2 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/openfaas-incubator/connector-sdk/types/invoker.go

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)