Use 'nil' instead of empty map in 'catcher' calls system. Improve code readability and reduce memory allocation overhead.

Author: JocLRojas

bitdefender/configuration/config.go

@@ -38,7 +38,7 @@ func ConfigureModules(cnf *types.ConfigurationSection, mutex *sync.Mutex) {
 		time.Sleep(delayCheckConfig)
 
 		if err := utils.ConnectionChecker(constants.URL_CHECK_CONNECTION); err != nil {
-			catcher.Error("Failed to establish connection", err, map[string]any{})
+			catcher.Error("Failed to establish connection", err, nil)
 		}
 
 		tempModuleConfig, err := client.GetUTMConfig(enum.BITDEFENDER)
@@ -47,7 +47,7 @@ func ConfigureModules(cnf *types.ConfigurationSection, mutex *sync.Mutex) {
 				continue
 			}
 			if (err.Error() != "") && (err.Error() != " ") {
-				catcher.Error("error getting configuration of the Bitdefender module", err, map[string]any{})
+				catcher.Error("error getting configuration of the Bitdefender module", err, nil)
 			}
 			continue
 		}
@@ -61,16 +61,16 @@ func ConfigureModules(cnf *types.ConfigurationSection, mutex *sync.Mutex) {
 				if !araAnyEmpty(group.Configurations[0].ConfValue, group.Configurations[1].ConfValue, group.Configurations[2].ConfValue, group.Configurations[3].ConfValue) {
 					catcher.Info("new configuration found", map[string]any{"groupName": group.GroupName, "master": group.Configurations[2].ConfValue, "CompanyIDs": group.Configurations[3].ConfValue})
 					if err := confBDGZApiPush(group, "sendConf"); err != nil {
-						catcher.Error("error sending configuration", err, map[string]any{})
+						catcher.Error("error sending configuration", err, nil)
 						continue
 					}
 					time.Sleep(15 * time.Second)
 					if err := confBDGZApiPush(group, "getConf"); err != nil {
-						catcher.Error("error getting configuration", err, map[string]any{})
+						catcher.Error("error getting configuration", err, nil)
 						continue
 					}
 					if err := confBDGZApiPush(group, "sendTest"); err != nil {
-						catcher.Error("error sending test event", err, map[string]any{})
+						catcher.Error("error sending test event", err, nil)
 						continue
 					}
 
@@ -101,7 +101,7 @@ func confBDGZApiPush(config types.ModuleGroup, operation string) error {
 	for i := 0; i < 5; i++ {
 		response, err := fn(config)
 		if err != nil {
-			catcher.Error("error sending configuration", err, map[string]any{})
+			catcher.Error("error sending configuration", err, nil)
 			time.Sleep(1 * time.Minute)
 			continue
 		}
@@ -114,7 +114,7 @@ func confBDGZApiPush(config types.ModuleGroup, operation string) error {
 			regex := regexp.MustCompile(`result":true`)
 			match := regex.Match([]byte(string(myBody)))
 			if match {
-				catcher.Info("Configuration sent correctly", map[string]any{})
+				catcher.Info("Configuration sent correctly", nil)
 			}
 		}
 		return nil
@@ -123,33 +123,33 @@ func confBDGZApiPush(config types.ModuleGroup, operation string) error {
 }
 
 func sendPushEventSettings(config types.ModuleGroup) (*http.Response, error) {
-	catcher.Info("Sending configuration...", map[string]any{})
+	catcher.Info("Sending configuration...", nil)
 	byteTemplate := getTemplateSetPush(config)
 	body, err := json.Marshal(byteTemplate)
 	if err != nil {
-		catcher.Error("error when marshaling the request body to send the configuration", err, map[string]any{})
+		catcher.Error("error when marshaling the request body to send the configuration", err, nil)
 		return nil, err
 	}
 	return sendRequest(body, config)
 }
 
 func getPushEventSettings(config types.ModuleGroup) (*http.Response, error) {
-	catcher.Info("Checking configuration...", map[string]any{})
+	catcher.Info("Checking configuration...", nil)
 	byteTemplate := getTemplateGet()
 	body, err := json.Marshal(byteTemplate)
 	if err != nil {
-		catcher.Error("error when marshaling the request body to send the configuration", err, map[string]any{})
+		catcher.Error("error when marshaling the request body to send the configuration", err, nil)
 		return nil, err
 	}
 	return sendRequest(body, config)
 }
 
 func sendTestPushEvent(config types.ModuleGroup) (*http.Response, error) {
-	catcher.Info("Sending Event Test...", map[string]any{})
+	catcher.Info("Sending Event Test...", nil)
 	byteTemplate := getTemplateTest()
 	body, err := json.Marshal(byteTemplate)
 	if err != nil {
-		catcher.Error("error when marshaling the request body to send the configuration", err, map[string]any{})
+		catcher.Error("error when marshaling the request body to send the configuration", err, nil)
 		return nil, err
 	}
 	return sendRequest(body, config)

bitdefender/main.go

@@ -22,20 +22,20 @@ var (
 func main() {
 	path, err := utils.GetMyPath()
 	if err != nil {
-		catcher.Error("failed to get current path", err, map[string]any{})
+		catcher.Error("failed to get current path", err, nil)
 		os.Exit(1)
 	}
 
 	certsPath := filepath.Join(path, "certs")
 	err = utils.CreatePathIfNotExist(certsPath)
 	if err != nil {
-		catcher.Error("error creating path", err, map[string]any{})
+		catcher.Error("error creating path", err, nil)
 		os.Exit(1)
 	}
 
 	err = utils.GenerateCerts(certsPath)
 	if err != nil {
-		catcher.Error("error generating certificates", err, map[string]any{})
+		catcher.Error("error generating certificates", err, nil)
 		os.Exit(1)
 	}
 

bitdefender/server/server.go

@@ -20,13 +20,13 @@ var syslogHelper EpsSyslogHelper
 // GetBDGZLogs gets the Bitdefender Api Push logs and sends them to the syslog server
 func GetBDGZLogs(config *types.ConfigurationSection) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
-		catcher.Info("New group of events received", map[string]any{})
+		catcher.Info("New group of events received", nil)
 		// Check if the Bitdefender Module is active
 		if config.ModuleActive {
 			//Check if the authorization exist
 			if r.Header.Get("authorization") == "" {
 				messag := "401 Missing Authorization Header"
-				catcher.Error(messag, nil, map[string]any{})
+				catcher.Error(messag, nil, nil)
 				j, _ := json.Marshal(messag)
 				w.WriteHeader(http.StatusUnauthorized)
 				w.Write(j)
@@ -42,7 +42,7 @@ func GetBDGZLogs(config *types.ConfigurationSection) http.HandlerFunc {
 			}
 			if !isAuth {
 				messag := "401 Invalid Authentication Credentials"
-				catcher.Error(messag, nil, map[string]any{})
+				catcher.Error(messag, nil, nil)
 				j, _ := json.Marshal(messag)
 				w.WriteHeader(http.StatusUnauthorized)
 				w.Write(j)
@@ -53,7 +53,7 @@ func GetBDGZLogs(config *types.ConfigurationSection) http.HandlerFunc {
 			var newBody schema.BodyEvents
 			err := json.NewDecoder(r.Body).Decode(&newBody)
 			if err != nil {
-				catcher.Error("error to decode body", err, map[string]any{})
+				catcher.Error("error to decode body", err, nil)
 				return
 			}
 
@@ -66,7 +66,7 @@ func GetBDGZLogs(config *types.ConfigurationSection) http.HandlerFunc {
 			w.WriteHeader(http.StatusOK)
 			w.Write(j)
 		} else {
-			catcher.Error("Bitdefender module disabled", nil, map[string]any{})
+			catcher.Error("Bitdefender module disabled", nil, nil)
 		}
 	}
 }
@@ -99,7 +99,7 @@ func ServerUp(cnf *types.ConfigurationSection, certsPath string) {
 		catcher.Info("Listening in port", map[string]any{"port": constants.GetConnectorPort()})
 		err := server.ListenAndServeTLS(filepath.Join(certsPath, "server.crt"), filepath.Join(certsPath, "server.key"))
 		if err != nil {
-			catcher.Error("error starting server", err, map[string]any{})
+			catcher.Error("error starting server", err, nil)
 		}
 		//Close connection with syslogServer
 		syslogHelper.clientSyslog.Close()

bitdefender/server/syslog.go

@@ -38,7 +38,7 @@ func (g *EpsSyslogHelper) SentToSyslog(config *types.ConfigurationSection, event
 				pattern := "BitdefenderGZCompanyId=" + compID
 				match, err := regexp.MatchString(pattern, syslogMessage)
 				if err != nil {
-					catcher.Error("error matching pattern", err, map[string]any{})
+					catcher.Error("error matching pattern", err, nil)
 					continue
 				}
 				if match {