From 70ba06ed5fa9063798608a8d67cf611799e3887f Mon Sep 17 00:00:00 2001
From: jar3b <hellotan@live.ru>
Date: Sat, 28 Dec 2019 21:39:12 +0300
Subject: [PATCH] fix: loading ALLOWED_TASKS if empty value passed; chore:
 update logging for task loading message

---
 src/main.go         | 9 +++++----
 src/tasks/models.go | 6 +++---
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/main.go b/src/main.go
index 27f9a54..678c43f 100644
--- a/src/main.go
+++ b/src/main.go
@@ -42,16 +42,17 @@ func main() {
 	initLog(*debug)
 
 	// get allowed tasks
-	var allowedTasks map[string]bool
+	var allowedTasks *map[string]bool
 	if os.Getenv("ALLOWED_TASKS") != "" {
-		allowedTasks = make(map[string]bool, 0)
+		at := make(map[string]bool, 0)
+		allowedTasks = &at
 		for _, t := range strings.Split(os.Getenv("ALLOWED_TASKS"), ",") {
-			allowedTasks[t] = true
+			(*allowedTasks)[t] = true
 		}
 	}
 
 	// manage tasks
-	taskList, err := tasks.LoadTasks(*configFile, &allowedTasks)
+	taskList, err := tasks.LoadTasks(*configFile, allowedTasks)
 	if err != nil {
 		log.Fatalf("cannot load %s: %v", *configFile, err)
 		return
diff --git a/src/tasks/models.go b/src/tasks/models.go
index e96363a..6e1c143 100644
--- a/src/tasks/models.go
+++ b/src/tasks/models.go
@@ -198,10 +198,10 @@ func (di *ConfigDescriptiveInfo) InitTasks(allowedTasksMap *map[string]bool) []e
 	}
 
 	log.Infof(
-		"%d tasks loaded - enabled: %s, disabled: %s",
+		"%d tasks loaded - enabled: '%s', disabled: '%s'",
 		len(di.Tasks),
-		strings.Join(taskNamesEnabled, ", "),
-		strings.Join(taskNamesDisabled, ", "),
+		strings.TrimRight(strings.Join(taskNamesEnabled, ", "), ", "),
+		strings.TrimRight(strings.Join(taskNamesDisabled, ", "), ", "),
 	)
 
 	return errList