replaced log.Println to systemWideLogger.PrintAndLog

desktop.go

@@ -338,7 +338,7 @@ func setDesktopLocationFromPath(filename string, username string, x int, y int)
 		return err
 	}
 
-	//log.Println(key,string(jsonstring))
+	//systemWideLogger.PrintAndLog(key,string(jsonstring),nil)
 	//Write result to database
 	sysdb.Write("desktop", username+"/filelocation/"+filename, string(jsonstring))
 	return nil

documents/common.go

@@ -64,7 +64,7 @@ func mv(r *http.Request, getParamter string, postMode bool) (string, error) {
 		keys, ok := r.URL.Query()[getParamter]
 
 		if !ok || len(keys[0]) < 1 {
-			//log.Println("Url Param " + getParamter +" is missing")
+			//systemWideLogger.PrintAndLog("Url Param " + getParamter +" is missing",nil)
 			return "", errors.New("GET paramter " + getParamter + " not found or it is empty")
 		}
 

main.go

@@ -3,7 +3,6 @@ package main
 import (
 	"flag"
 	"fmt"
-	"log"
 	"net/http"
 	"os"
 	"os/signal"
@@ -98,8 +97,8 @@ func main() {
 	os.Mkdir(*tmp_directory, 0777)
 
 	//Print copyRight information
-	log.Println("ArozOS(C) " + strconv.Itoa(time.Now().Year()) + " " + deviceVendor + ".")
-	log.Println("ArozOS " + build_version + " Revision " + internal_version)
+	systemWideLogger.PrintAndLog("Main", "ArozOS(C) "+strconv.Itoa(time.Now().Year())+" "+deviceVendor+".", nil)
+	systemWideLogger.PrintAndLog("Main", "ArozOS "+build_version+" Revision "+internal_version, nil)
 
 	/*
 		New Implementation of the ArOZ Online System, Sept 2020
@@ -131,14 +130,14 @@ func main() {
 		if *use_tls {
 			if !*disable_http {
 				go func() {
-					log.Println("Standard (HTTP) Web server listening at :" + strconv.Itoa(*listen_port))
+					systemWideLogger.PrintAndLog("Web Server", "Standard (HTTP) Web server listening at :"+strconv.Itoa(*listen_port), nil)
 					http.ListenAndServe(":"+strconv.Itoa(*listen_port), nil)
 				}()
 			}
-			log.Println("Secure (HTTPS) Web server listening at :" + strconv.Itoa(*tls_listen_port))
+			systemWideLogger.PrintAndLog("Web Server", "Secure (HTTPS) Web server listening at :"+strconv.Itoa(*tls_listen_port), nil)
 			http.ListenAndServeTLS(":"+strconv.Itoa(*tls_listen_port), *tls_cert, *tls_key, nil)
 		} else {
-			log.Println("Web server listening at :" + strconv.Itoa(*listen_port))
+			systemWideLogger.PrintAndLog("Web Server", "Web server listening at :"+strconv.Itoa(*listen_port), nil)
 			http.ListenAndServe(":"+strconv.Itoa(*listen_port), nil)
 		}
 	}()

network.forward.go

@@ -94,7 +94,7 @@ func portforward_handleForward(w http.ResponseWriter, r *http.Request) {
 				ReadOnly: readOnly,
 			}
 
-			//log.Println(thisPort)
+			//systemWideLogger.PrintAndLog(thisPort,nil)
 
 			forwardPorts = append(forwardPorts, thisPort)
 		}

network.go

@@ -201,7 +201,7 @@ func StartNetworkServices() {
 }
 
 func StopNetworkServices() {
-	//log.Println("Shutting Down Network Services...")
+	//systemWideLogger.PrintAndLog("Shutting Down Network Services...",nil)
 	//Shutdown uPNP service if enabled
 	if *allow_upnp {
 		systemWideLogger.PrintAndLog("System", "<!> Shutting down uPNP service", nil)

notification.go

@@ -1,7 +1,6 @@
 package main
 
 import (
-	"log"
 	"strconv"
 	"time"
 
@@ -45,7 +44,7 @@ func notificationInit() {
 		})
 
 	if err != nil {
-		log.Println("[Notification/SMTPN] Unable to start smtpn agent: " + err.Error())
+		systemWideLogger.PrintAndLog("Notification", "[Notification/SMTPN] Unable to start smtpn agent: "+err.Error(), nil)
 	} else {
 		notificationQueue.RegisterNotificationAgent(smtpAgent)
 	}

permission.go

@@ -2,7 +2,6 @@ package main
 
 import (
 	"encoding/json"
-	"log"
 	"net/http"
 
 	"imuslab.com/arozos/mod/common"
@@ -13,7 +12,7 @@ import (
 func permissionNewHandler() {
 	ph, err := permission.NewPermissionHandler(sysdb)
 	if err != nil {
-		log.Println("Permission Handler creation failed.")
+		systemWideLogger.PrintAndLog("Permission", "Permission Handler creation failed.", err)
 		panic(err)
 	}
 	permissionHandler = ph

quota.go

@@ -2,11 +2,11 @@ package main
 
 import (
 	"encoding/json"
-	"log"
 	"net/http"
 	"os"
 	"path/filepath"
 	"sort"
+	"strconv"
 	"strings"
 
 	"imuslab.com/arozos/mod/common"
@@ -77,7 +77,7 @@ func system_disk_quota_setQuota(w http.ResponseWriter, r *http.Request) {
 	//Qutasize unit is in MB
 	quotaSize = quotaSize << 20
 
-	log.Println("Updating "+groupname+" to ", quotaSize, "WIP")
+	systemWideLogger.PrintAndLog("Quota", "Updating "+groupname+" to "+strconv.FormatInt(quotaSize, 10)+"WIP", nil)
 	common.SendOK(w)
 
 }

scheduler.go

@@ -1,7 +1,6 @@
 package main
 
 import (
-	"log"
 	"net/http"
 
 	"imuslab.com/arozos/mod/common"
@@ -68,7 +67,7 @@ func SchedulerInit() {
 	//Startup the ArOZ Emulated Crontab Service
 	newScheduler, err := scheduler.NewScheduler(userHandler, AGIGateway, "system/cron.json")
 	if err != nil {
-		log.Println("ArOZ Emulated Cron Startup Failed. Stopping all scheduled tasks.")
+		systemWideLogger.PrintAndLog("Cron", "ArOZ Emulated Cron Startup Failed. Stopping all scheduled tasks.", err)
 	}
 
 	systemScheduler = newScheduler

startup.flags.go

@@ -2,7 +2,6 @@ package main
 
 import (
 	"encoding/json"
-	"log"
 	"net/http"
 
 	"imuslab.com/arozos/mod/common"
@@ -89,7 +88,7 @@ func handleBootFlagsFunction(w http.ResponseWriter, r *http.Request) {
 		}
 
 		//Update the current global flags
-		log.Println("Updating boot flag to:", newSettings)
+		systemWideLogger.PrintAndLog("Main", "Updating boot flag to:"+newSettings, nil)
 		*host_name = newConfig.Hostname
 		max_upload_size = int64(newConfig.MaxUploadSize << 20)
 		*upload_buf = newConfig.MaxFileUploadBuff

startup.go

@@ -7,7 +7,6 @@ package main
 
 import (
 	"fmt"
-	"log"
 	"os"
 
 	db "imuslab.com/arozos/mod/database"
@@ -22,7 +21,7 @@ func RunStartup() {
 
 	//Check if system or web both not exists and web.tar.gz exists. Unzip it for the user
 	if (!fs.FileExists("system/") || !fs.FileExists("web/")) && fs.FileExists("./web.tar.gz") {
-		log.Println("Unzipping system critical files from archive")
+		systemWideLogger.PrintAndLog("Update", "Unzipping system critical files from archive", nil)
 		extErr := filesystem.ExtractTarGzipFile("./web.tar.gz", "./")
 		if extErr != nil {
 			//Extract failed
@@ -34,7 +33,7 @@ func RunStartup() {
 		//Extract success
 		extErr = os.Remove("./web.tar.gz")
 		if extErr != nil {
-			log.Println("Unable to remove web.tar.gz: ", extErr)
+			systemWideLogger.PrintAndLog("Update", "Unable to remove web.tar.gz: "+extErr.Error(), extErr)
 		}
 	}
 

storage.bridge.go

@@ -2,7 +2,6 @@ package main
 
 import (
 	"errors"
-	"log"
 
 	fs "imuslab.com/arozos/mod/filesystem"
 	storage "imuslab.com/arozos/mod/storage"
@@ -16,7 +15,7 @@ import (
 func BridgeStoragePoolInit() {
 	bridgeRecords, err := bridgeManager.ReadConfig()
 	if err != nil {
-		log.Println("[ERROR] Fail to read File System Handler bridge config")
+		systemWideLogger.PrintAndLog("Storage", "[ERROR] Fail to read File System Handler bridge config", err)
 		return
 	}
 
@@ -35,16 +34,16 @@ func BridgeStoragePoolInit() {
 
 		err = BridgeFSHandlerToGroup(fsh, basePool)
 		if err != nil {
-			log.Println("Failed to bridge "+fsh.UUID+":/ to "+basePool.Owner, err.Error())
+			systemWideLogger.PrintAndLog("Storage", "Failed to bridge "+fsh.UUID+":/ to "+basePool.Owner+err.Error(), err)
 		}
-		log.Println(fsh.UUID + ":/ bridged to " + basePool.Owner + " Storage Pool")
+		systemWideLogger.PrintAndLog("Storage", fsh.UUID+":/ bridged to "+basePool.Owner+" Storage Pool", nil)
 	}
 }
 
 func BridgeStoragePoolForGroup(group string) {
 	bridgeRecords, err := bridgeManager.ReadConfig()
 	if err != nil {
-		log.Println("Failed to bridge FSH for group " + group)
+		systemWideLogger.PrintAndLog("Storage", "Failed to bridge FSH for group "+group, err)
 		return
 	}
 
@@ -64,9 +63,9 @@ func BridgeStoragePoolForGroup(group string) {
 
 			err = BridgeFSHandlerToGroup(fsh, basePool)
 			if err != nil {
-				log.Println("Failed to bridge "+fsh.UUID+":/ to "+basePool.Owner, err.Error())
+				systemWideLogger.PrintAndLog("Storage", "Failed to bridge "+fsh.UUID+":/ to "+basePool.Owner+err.Error(), err)
 			}
-			log.Println(fsh.UUID + ":/ bridged to " + basePool.Owner + " Storage Pool")
+			systemWideLogger.PrintAndLog("Storage", fsh.UUID+":/ bridged to "+basePool.Owner+" Storage Pool", nil)
 		}
 	}
 }

storage.go

@@ -3,7 +3,6 @@ package main
 import (
 	"errors"
 	"io/ioutil"
-	"log"
 	"os"
 	"path/filepath"
 	"runtime"
@@ -61,7 +60,7 @@ func LoadBaseStoragePool() error {
 	})
 
 	if err != nil {
-		log.Println("Failed to initiate user root storage directory: "+*root_directory, err.Error())
+		systemWideLogger.PrintAndLog("Storage", "Failed to initiate user root storage directory: "+*root_directory+err.Error(), err)
 		return err
 	}
 	fsHandlers = append(fsHandlers, baseHandler)
@@ -77,7 +76,7 @@ func LoadBaseStoragePool() error {
 	})
 
 	if err != nil {
-		log.Println("Failed to initiate tmp storage directory: "+*tmp_directory, err.Error())
+		systemWideLogger.PrintAndLog("Storage", "Failed to initiate tmp storage directory: "+*tmp_directory+err.Error(), err)
 		return err
 	}
 	fsHandlers = append(fsHandlers, tmpHandler)
@@ -86,16 +85,16 @@ func LoadBaseStoragePool() error {
 	rawConfig, err := ioutil.ReadFile(*storage_config_file)
 	if err != nil {
 		//File not found. Use internal storage only
-		log.Println("Storage configuration file not found. Using internal storage only.")
+		systemWideLogger.PrintAndLog("Storage", "Storage configuration file not found. Using internal storage only.", err)
 	} else {
 		//Configuration loaded. Initializing handler
 		externalHandlers, err := fs.NewFileSystemHandlersFromJSON(rawConfig)
 		if err != nil {
-			log.Println("Failed to load storage configuration: " + err.Error() + " -- Skipping")
+			systemWideLogger.PrintAndLog("Storage", "Failed to load storage configuration: "+err.Error()+" -- Skipping", err)
 		} else {
 			for _, thisHandler := range externalHandlers {
 				fsHandlers = append(fsHandlers, thisHandler)
-				log.Println(thisHandler.Name + " Mounted as " + thisHandler.UUID + ":/")
+				systemWideLogger.PrintAndLog("Storage", thisHandler.Name+" Mounted as "+thisHandler.UUID+":/", err)
 			}
 
 		}
@@ -104,7 +103,7 @@ func LoadBaseStoragePool() error {
 	//Create a base storage pool for all users
 	sp, err := storage.NewStoragePool(fsHandlers, "system")
 	if err != nil {
-		log.Println("Failed to create base Storaeg Pool")
+		systemWideLogger.PrintAndLog("Storage", "Failed to create base Storaeg Pool", err)
 		return err
 	}
 
@@ -138,26 +137,26 @@ func LoadStoragePoolForGroup(pg *permission.PermissionGroup) error {
 		//Read the config file
 		pgStorageConfig, err := os.ReadFile(expectedConfigPath)
 		if err != nil {
-			log.Println("Failed to read config for " + pg.Name + ": " + err.Error())
+			systemWideLogger.PrintAndLog("Storage", "Failed to read config for "+pg.Name+": "+err.Error(), err)
 			return errors.New("Failed to read config for " + pg.Name + ": " + err.Error())
 		}
 
 		//Generate fsHandler form json
 		thisGroupFsHandlers, err := fs.NewFileSystemHandlersFromJSON(pgStorageConfig)
 		if err != nil {
-			log.Println("Failed to load storage configuration: " + err.Error())
+			systemWideLogger.PrintAndLog("Storage", "Failed to load storage configuration: "+err.Error(), err)
 			return errors.New("Failed to load storage configuration: " + err.Error())
 		}
 
 		//Show debug message
 		for _, thisHandler := range thisGroupFsHandlers {
-			log.Println(thisHandler.Name + " Mounted as " + thisHandler.UUID + ":/ for group " + pg.Name)
+			systemWideLogger.PrintAndLog("Storage", thisHandler.Name+" Mounted as "+thisHandler.UUID+":/ for group "+pg.Name, err)
 		}
 
 		//Create a storage pool from these handlers
 		sp, err := storage.NewStoragePool(thisGroupFsHandlers, pg.Name)
 		if err != nil {
-			log.Println("Failed to create storage pool for " + pg.Name)
+			systemWideLogger.PrintAndLog("Storage", "Failed to create storage pool for "+pg.Name, err)
 			return errors.New("Failed to create storage pool for " + pg.Name)
 		}
 
@@ -173,7 +172,7 @@ func LoadStoragePoolForGroup(pg *permission.PermissionGroup) error {
 		//Create a new empty storage pool for this group
 		sp, err := storage.NewStoragePool([]*fs.FileSystemHandler{}, pg.Name)
 		if err != nil {
-			log.Println("Failed to create empty storage pool for group: ", pg.Name)
+			systemWideLogger.PrintAndLog("Storage", "Failed to create empty storage pool for group: "+pg.Name, err)
 		}
 		pg.StoragePool = sp
 		pg.StoragePool.OtherPermission = arozfs.FsDenied

storage.pool.go

@@ -4,7 +4,6 @@ import (
 	"encoding/json"
 	"errors"
 	"io/ioutil"
-	"log"
 	"net/http"
 	"os"
 	"path/filepath"
@@ -94,7 +93,7 @@ func HandleFSHEdit(w http.ResponseWriter, r *http.Request) {
 			common.SendErrorResponse(w, err.Error())
 			return
 		}
-		log.Println(newFsOption)
+		//systemWideLogger.PrintAndLog("Storage", newFsOption, nil)
 
 		uuid := newFsOption.Uuid
 
@@ -142,7 +141,7 @@ func HandleFSHEdit(w http.ResponseWriter, r *http.Request) {
 			originalConfigFile, _ := ioutil.ReadFile(configFile)
 			err := json.Unmarshal(originalConfigFile, &oldConfigs)
 			if err != nil {
-				log.Println(err)
+				systemWideLogger.PrintAndLog("Storage", err.Error(), err)
 			}
 		}
 
@@ -175,7 +174,7 @@ func getFSHConfigFromGroupAndUUID(group string, uuid string) (*fs.FileSystemOpti
 
 	//Check if file exists.
 	if !fs.FileExists(targerFile) {
-		log.Println("Config file not found: ", targerFile)
+		systemWideLogger.PrintAndLog("Storage", "Config file not found: "+targerFile, nil)
 		return nil, errors.New("Configuration file not found")
 	}
 
@@ -192,7 +191,7 @@ func getFSHConfigFromGroupAndUUID(group string, uuid string) (*fs.FileSystemOpti
 	loadedConfig := []fs.FileSystemOption{}
 	err = json.Unmarshal(configContent, &loadedConfig)
 	if err != nil {
-		log.Println("Request to parse config error: "+err.Error(), targerFile)
+		systemWideLogger.PrintAndLog("Storage", "Request to parse config error: "+err.Error()+targerFile, err)
 		return nil, err
 	}
 
@@ -218,7 +217,7 @@ func setFSHConfigByGroupAndId(group string, uuid string, options fs.FileSystemOp
 
 	//Check if file exists.
 	if !fs.FileExists(targerFile) {
-		log.Println("Config file not found: ", targerFile)
+		systemWideLogger.PrintAndLog("Storage", "Config file not found: "+targerFile, nil)
 		return errors.New("Configuration file not found")
 	}
 
@@ -235,7 +234,7 @@ func setFSHConfigByGroupAndId(group string, uuid string, options fs.FileSystemOp
 	loadedConfig := []fs.FileSystemOption{}
 	err = json.Unmarshal(configContent, &loadedConfig)
 	if err != nil {
-		log.Println("Request to parse config error: "+err.Error(), targerFile)
+		systemWideLogger.PrintAndLog("Storage", "Request to parse config error: "+err.Error()+targerFile, err)
 		return err
 	}
 
@@ -355,7 +354,7 @@ func HandleStoragePoolReload(w http.ResponseWriter, r *http.Request) {
 		//Start BasePool again
 		err := LoadBaseStoragePool()
 		if err != nil {
-			log.Println(err.Error())
+			systemWideLogger.PrintAndLog("Storage", err.Error(), err)
 		} else {
 			//Update userHandler's basePool
 			userHandler.UpdateStoragePool(baseStoragePool)
@@ -363,7 +362,7 @@ func HandleStoragePoolReload(w http.ResponseWriter, r *http.Request) {
 
 		//Reload all permission group's pool
 		for _, pg := range permissionHandler.PermissionGroups {
-			log.Println("Reloading Storage Pool for: " + pg.Name)
+			systemWideLogger.PrintAndLog("Storage", "Reloading Storage Pool for: "+pg.Name, err)
 
 			//Pool should be exists. Close it
 			pg.StoragePool.Close()
@@ -390,7 +389,7 @@ func HandleStoragePoolReload(w http.ResponseWriter, r *http.Request) {
 			//Start BasePool again
 			err := LoadBaseStoragePool()
 			if err != nil {
-				log.Println(err.Error())
+				systemWideLogger.PrintAndLog("Storage", err.Error(), err)
 			} else {
 				//Update userHandler's basePool
 				userHandler.UpdateStoragePool(baseStoragePool)
@@ -405,7 +404,7 @@ func HandleStoragePoolReload(w http.ResponseWriter, r *http.Request) {
 				return
 			}
 
-			log.Println("Reloading Storage Pool for: " + pool)
+			systemWideLogger.PrintAndLog("Storage", "Reloading Storage Pool for: "+pool, nil)
 
 			//Pool should be exists. Close it
 			pg := permissionHandler.GetPermissionGroupByName(pool)
@@ -568,7 +567,7 @@ func HandleStorageNewFsHandler(w http.ResponseWriter, r *http.Request) {
 		originalConfigFile, _ := ioutil.ReadFile(configFile)
 		err := json.Unmarshal(originalConfigFile, &oldConfigs)
 		if err != nil {
-			log.Println(err)
+			systemWideLogger.PrintAndLog(err,nil)
 		}
 	}
 
@@ -667,7 +666,7 @@ func HandleFSHBridging(w http.ResponseWriter, r *http.Request) {
 	//Add the target FSH into the base pool
 	basePoolObject, err := GetStoragePoolByOwner(basePool)
 	if err != nil {
-		log.Println("Bridge FSH failed: ", err.Error())
+		systemWideLogger.PrintAndLog("Storage", "Bridge FSH failed: "+err.Error(), err)
 		common.SendErrorResponse(w, "Storage pool not found")
 		return
 	}

system.go

@@ -120,7 +120,7 @@ func systemIdGenerateSystemUUID() {
 func systemIdGetSystemUUID() string {
 	fileUUID, err := ioutil.ReadFile("./system/dev.uuid")
 	if err != nil {
-		log.Println("Unable to read system UUID from dev.uuid file")
+		systemWideLogger.PrintAndLog("Storage", "Unable to read system UUID from dev.uuid file", err)
 		log.Fatal(err)
 	}
 

system.info.go

@@ -2,7 +2,6 @@ package main
 
 import (
 	"encoding/json"
-	"log"
 	"net/http"
 	"runtime"
 	"time"
@@ -16,8 +15,8 @@ import (
 
 //InitShowSysInformation xxx
 func SystemInfoInit() {
-	log.Println("Operation System: " + runtime.GOOS)
-	log.Println("System Architecture: " + runtime.GOARCH)
+	systemWideLogger.PrintAndLog("Main", "Operation System: "+runtime.GOOS, nil)
+	systemWideLogger.PrintAndLog("Main", "System Architecture: "+runtime.GOARCH, nil)
 
 	//Updates 5 Dec 2020, Added permission router
 	router := prout.NewModuleRouter(prout.RouterOption{
@@ -140,7 +139,7 @@ func SystemInfoInit() {
 				execute, _ := common.Mv(r, "exec", true)
 				if execute == "true" && r.Method == http.MethodPost {
 					//Do the update
-					log.Println("REQUESTING LAUNCHER FOR UPDATE RESTART")
+					systemWideLogger.PrintAndLog("Main", "REQUESTING LAUNCHER FOR UPDATE RESTART", nil)
 					executeShutdownSequence()
 					common.SendOK(w)
 				} else if execute == "true" {

user.go

@@ -8,7 +8,6 @@ package main
 
 import (
 	"encoding/json"
-	"log"
 	"net/http"
 	"strconv"
 	"strings"
@@ -186,21 +185,21 @@ func user_handleUserEdit(w http.ResponseWriter, r *http.Request) {
 		//Update the target user's group
 		newgroup, err := common.Mv(r, "newgroup", true)
 		if err != nil {
-			log.Println(err.Error())
+			systemWideLogger.PrintAndLog("User", err.Error(), err)
 			common.SendErrorResponse(w, "New Group not defined")
 			return
 		}
 
 		newQuota, err := common.Mv(r, "quota", true)
 		if err != nil {
-			log.Println(err.Error())
+			systemWideLogger.PrintAndLog("User", err.Error(), err)
 			common.SendErrorResponse(w, "Quota not defined")
 			return
 		}
 
 		quotaInt, err := strconv.Atoi(newQuota)
 		if err != nil {
-			log.Println(err.Error())
+			systemWideLogger.PrintAndLog("User", err.Error(), err)
 			common.SendErrorResponse(w, "Invalid Quota Value")
 			return
 		}
@@ -208,7 +207,7 @@ func user_handleUserEdit(w http.ResponseWriter, r *http.Request) {
 		newGroupKeys := []string{}
 		err = json.Unmarshal([]byte(newgroup), &newGroupKeys)
 		if err != nil {
-			log.Println(err.Error())
+			systemWideLogger.PrintAndLog("User", err.Error(), err)
 			common.SendErrorResponse(w, "Unable to parse new groups")
 			return
 		}

wifi.go

@@ -2,7 +2,6 @@ package main
 
 import (
 	"encoding/json"
-	"log"
 	"net/http"
 	"strings"
 
@@ -197,7 +196,7 @@ func network_wifi_handleConnect(w http.ResponseWriter, r *http.Request) {
 	}
 	connType, _ := common.Mv(r, "ConnType", true)
 	password, _ := common.Mv(r, "pwd", true)
-	log.Println("WiFi Switch Request Received. Genering Network Configuration...")
+	systemWideLogger.PrintAndLog("WiFi", "WiFi Switch Request Received. Genering Network Configuration...", nil)
 
 	identity, err := common.Mv(r, "identity", true)
 	if err != nil {
@@ -216,7 +215,7 @@ func network_wifi_handleConnect(w http.ResponseWriter, r *http.Request) {
 	}
 	common.SendJSONResponse(w, string(jsonString))
 
-	log.Println("WiFi Connected")
+	systemWideLogger.PrintAndLog("WiFi", "WiFi Connected", nil)
 
 }