Skip to content

Commit 8ad3353

Browse files
Fix NATS Logger
Signed-off-by: AbdullahAlShaad <[email protected]>
1 parent 629e0f2 commit 8ad3353

File tree

1 file changed

+14
-9
lines changed

1 file changed

+14
-9
lines changed

nats-logger/main.go

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@ import (
3030
"k8s.io/klog/v2"
3131
)
3232

33+
var natsSuccessMessage, natsFailureMessage string
34+
3335
func main() {
3436
source := os.Getenv("SHIPPER_FILE")
3537
if source == "" {
@@ -52,12 +54,7 @@ func main() {
5254
log.Fatalf("Could not write creds: %s\n", err)
5355
}
5456
defer os.Remove(credFile.Name())
55-
//partition, name, err := util.Partition()
56-
//if err != nil {
57-
// log.Fatal(err.Error())
58-
//}
5957

60-
// addr := "this-is-nats.appscode.ninja:4222"
6158
nc, err := util.NewConnection(addr, credFile.Name())
6259
if err != nil {
6360
log.Fatalf("Could not connect to NATS: %s\n", err)
@@ -69,7 +66,16 @@ func main() {
6966
title = "Cluster Operation Logs"
7067
}
7168

72-
msg := newResponse(TaskStatusStarted, id, title, "Creating VM Instance")
69+
natsSuccessMessage, ok = os.LookupEnv("NATS_SUCCESS_MESSAGE")
70+
if !ok {
71+
natsSuccessMessage = "Task Completed Successfully"
72+
}
73+
natsFailureMessage, ok = os.LookupEnv("NATS_FAILURE_MESSAGE")
74+
if !ok {
75+
natsFailureMessage = "Task Failed"
76+
}
77+
78+
msg := newResponse(TaskStatusStarted, id, title, "Starting Cluster Operation...")
7379
if err = nc.Publish(subject, msg); err != nil {
7480
log.Printf("Could not publish response")
7581
}
@@ -110,12 +116,11 @@ func publishFile(source, subject, id string, nc *nats.Conn) error {
110116
}
111117

112118
func generateTaskStatus(msg string) TaskStatus {
113-
if strings.Contains(msg, "Cluster provision: Task failed !") {
119+
if strings.Contains(msg, natsFailureMessage) {
114120
return TaskStatusFailed
115-
} else if strings.Contains(msg, "Cluster provision: Task completed successfully !") {
121+
} else if strings.Contains(msg, natsSuccessMessage) {
116122
return TaskStatusSuccess
117123
}
118-
119124
return TaskStatusRunning
120125
}
121126

0 commit comments

Comments
 (0)