Wait a bit more before starting to complain

[saartuer.git] / tysock.py

diff --git a/tysock.py b/tysock.py
index cd112144544e25beb5b06c8812dde0aa476f2e4c..676f57398b28b73f81e5882b79fefd831e84e6ca 100644 (file)
--- a/tysock.py
+++ b/tysock.py
@@ -1,4 +1,4 @@
-import socket, os, stat, struct, pwd
+import socket, os, stat, struct, pwd, errno

 from statemachine import StateMachine
 from libtuer import logger
 SO_PEERCRED = 17 # DO - NOT - TOUCH
 from statemachine import StateMachine
 from libtuer import logger
 SO_PEERCRED = 17 # DO - NOT - TOUCH


@@ -44,10 +44,11 @@ class TySocket():
                self._sock.listen(1)
        
        def _answer(self, conn):
                self._sock.listen(1)
        
        def _answer(self, conn):

-               def answer(msg):
+               def answer(msg, lastMsg = True):

                        # this is called in another thread, so it should be quick and not touch the TySocket
                        waynesend(conn, msg)
                        # this is called in another thread, so it should be quick and not touch the TySocket
                        waynesend(conn, msg)

-                       conn.close()
+                       if lastMsg:
+                               conn.close()

                return answer
        
        def accept(self):
                return answer
        
        def accept(self):


@@ -70,8 +71,11 @@ class TySocket():
                                        # _answer will be called, and it will close the connection
                                else:
                                        waynesend(conn, 'Command not found')
                                        # _answer will be called, and it will close the connection
                                else:
                                        waynesend(conn, 'Command not found')

-                                       conn.close()

                        except KeyboardInterrupt:
                                raise # forward Ctrl-C to the outside
                        except KeyboardInterrupt:
                                raise # forward Ctrl-C to the outside

+                       except socket.timeout:
+                               # it's okay
+                               logger.info("TySocket: Connection timed out")

                        except Exception as e:
                        except Exception as e:

-                               logger.error("TySocket: Something went wrong: %s" % str(e))
+                               logger.critical("TySocket: Something went wrong: %s" % str(e))
+                       conn.close()