Merge branch 'main' of git.gvk.idi.ntnu.no:Johannesb/dcsg2900-threattotal

api/google.go

@@ -17,8 +17,7 @@ import (
 //API documentation can be found in: https://developers.google.com/safe-browsing/v4
 // Contacted API Endpoint : https://safebrowsing.googleapis.com/v4/threatMatches
 func CallGoogleUrl(url string, response *utils.FrontendResponse2, wg *sync.WaitGroup) {
-	// Google API returnerer [] om den ikke kjenner til domenet / URL. Kan bruke dette til
-	// å avgjøre om det er malicious eller ikke.
+	// Google API returns [] if it does not know the domain or URL. This is used to determine if it is malicious or not. 
 	defer wg.Done()
 
 	var httpSearchURL, httpsSearchURL string
@@ -95,6 +94,7 @@ func CallGoogleUrl(url string, response *utils.FrontendResponse2, wg *sync.WaitG
 	err = json.Unmarshal(body, &jsonResponse)
 	if err != nil {
 		fmt.Println(err)
+		logging.Logerror(err, "ERROR unmarshalling data to struct -Safebrowsing API.")
 	}
 
 	utils.SetResponeObjectGoogle(jsonResponse, response)

logs/logging.go

@@ -6,6 +6,7 @@ import (
 	"os"
 )
 
+//Created with inspiration from https://dev.to/gholami1313/saving-log-messages-to-a-custom-log-file-in-golang-ce5
 //Function to handle logging of errors to errorlog file with message
 func Logerror(err error, msg string) {
 	// log to custom file
@@ -26,6 +27,7 @@ func Logerror(err error, msg string) {
 	log.Println(msg, err)
 }
 
+//Created with inspiration from https://dev.to/gholami1313/saving-log-messages-to-a-custom-log-file-in-golang-ce5
 //Function to handle information logging to infofile
 func Loginfo(msg string) {
 	LOG_FILE := "./logs/infolog"
@@ -45,6 +47,7 @@ func Loginfo(msg string) {
 	log.Println(msg)
 }
 
+//Created with inspiration from https://dev.to/gholami1313/saving-log-messages-to-a-custom-log-file-in-golang-ce5
 //Function to handle error message display to file. 
 func Logerrorinfo(msg string) {
 	// log to custom file

main.go

@@ -10,6 +10,7 @@ import (
 	// Internal
 	"dcsg2900-threattotal/api"
 	"dcsg2900-threattotal/auth"
+	logging "dcsg2900-threattotal/logs"
 	"dcsg2900-threattotal/storage"
 	"dcsg2900-threattotal/utils"
 
@@ -22,6 +23,7 @@ import (
 
 // Initialize global variables
 func init() {
+	logging.Loginfo("Initializing the application")
 	var err error
 
 	// Setting global varaibles in the utils package
@@ -67,7 +69,7 @@ func init() {
 }
 
 func main() {
-
+	logging.Loginfo("Starting the API")
 	r := gin.Default()
 	r.Use(cors.Default())