From 3804a7448bdc280e7b2ba3f98eb5c91b4ee1b3c7 Mon Sep 17 00:00:00 2001
From: Spekulaas <“ryan@aterve.nl”>
Date: Fri, 5 Jan 2024 10:23:06 +0100
Subject: [PATCH] added close connection / exit function

---
 goodchain/src/helpers/MenuHelper.py    |  6 ++----
 goodchain/src/helpers/UtilityHelper.py | 12 ++++++++++++
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/goodchain/src/helpers/MenuHelper.py b/goodchain/src/helpers/MenuHelper.py
index 012b483..d79e0f7 100644
--- a/goodchain/src/helpers/MenuHelper.py
+++ b/goodchain/src/helpers/MenuHelper.py
@@ -64,8 +64,7 @@ class MenuHelper:
             # check if choice is in menu
             match self.start_menu[choice]:
                 case "Exit":
-                    print(f"{utilityHelper.blinkMessage('Exiting system')}")
-                    exit()
+                    utilityHelper.closeConnection(self.peer_ip_addr, self.peer_port)
 
                 case "Explore the Blockchain":
                     blockHelper.exploreBlocks(self)
@@ -114,8 +113,7 @@ class MenuHelper:
             # check if choice is in menu
             match self.user_main_menu[choice]:
                 case "Exit":
-                    print(f"{utilityHelper.blinkMessage('Exiting system')}")
-                    exit()
+                    utilityHelper.closeConnection(self.peer_ip_addr, self.peer_port)
 
                 case "Log out":
                     self.user.logout()
diff --git a/goodchain/src/helpers/UtilityHelper.py b/goodchain/src/helpers/UtilityHelper.py
index c16d97f..c97faae 100644
--- a/goodchain/src/helpers/UtilityHelper.py
+++ b/goodchain/src/helpers/UtilityHelper.py
@@ -3,6 +3,7 @@ import hashlib
 import os
 from helpers import BlockHelper as blockHelper
 from helpers import TaskHelper as taskHelper
+from helpers import SocketHelper as socketHelper
 
 class bcolors:
     HEADER = '\033[95m'
@@ -94,5 +95,16 @@ def headerMessage(text):
 def blinkMessage(text):
     return bcolors.BLINK + text + bcolors.ENDC
 
+def closeConnection(ip, port):
+    socketHelper.sendObj(ip, "EXIT", port)
+    print(f"{bcolors.WARNING}Closing connection{bcolors.ENDC}")
+    close()
+
+def close():
+    print(f"{bcolors.WARNING}Exiting system{bcolors.ENDC}")
+    os._exit(0)
+    # close connection
+
+
 
     
\ No newline at end of file