summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJavier Sánchez Parra <jsanchez@soleta.eu>2020-08-21 14:38:57 +0200
committerOpenGnSys Support Team <soporte-og@soleta.eu>2020-08-21 18:39:35 +0200
commit0593119352b24c0372c0bd222641789c01fc4c5c (patch)
tree6a1d8bd6ff97ce1f0d6066cf0aad05cba8d70ed8
parentde129f7449b268354a84797e80a3de5004d96587 (diff)
#999 Fix ogClient session command
Disconnect gracefully from ogServer after booting OS, the script to start the OS calls kexec, so everything is gone after it. For Windows, this results in a reboot. This commit also improves the disconnect function to make sure the disconnection is synchronous.
-rw-r--r--src/ogClient.py1
-rw-r--r--src/ogRest.py2
2 files changed, 2 insertions, 1 deletions
diff --git a/src/ogClient.py b/src/ogClient.py
index b148b74..46ab9a2 100644
--- a/src/ogClient.py
+++ b/src/ogClient.py
@@ -119,6 +119,7 @@ class ogClient:
def disconnect(self):
self.state = State.FORCE_DISCONNECTED
+ self.sock.shutdown(socket.SHUT_RDWR)
self.sock.close()
def run(self):
diff --git a/src/ogRest.py b/src/ogRest.py
index 1bc82a1..7e6d276 100644
--- a/src/ogRest.py
+++ b/src/ogRest.py
@@ -120,7 +120,7 @@ class ogThread():
response = restResponse(ogResponses.OK)
client.send(response.get())
- ogRest.state = ThreadState.IDLE
+ client.disconnect()
def software(client, request, path, ogRest):
try: