projects
/
saartuer.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
there can be more than one message on the socket; empty the queue when shutting down...
[saartuer.git]
/
tysock.py
diff --git
a/tysock.py
b/tysock.py
index cd112144544e25beb5b06c8812dde0aa476f2e4c..11b5183b735c757f5740f73303106ce4cdfeca64 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):
@@
-74,4
+75,4
@@
class TySocket():
except KeyboardInterrupt:
raise # forward Ctrl-C to the outside
except Exception as e:
except KeyboardInterrupt:
raise # forward Ctrl-C to the outside
except Exception as e:
- logger.
error
("TySocket: Something went wrong: %s" % str(e))
+ logger.
critical
("TySocket: Something went wrong: %s" % str(e))