From: <los...@us...> - 2007-12-17 19:53:34
|
Revision: 636 http://fail2ban.svn.sourceforge.net/fail2ban/?rev=636&view=rev Author: lostcontrol Date: 2007-12-17 11:53:33 -0800 (Mon, 17 Dec 2007) Log Message: ----------- - Display a message if we could not bind the socket. Modified Paths: -------------- branches/FAIL2BAN-0_8/server/asyncserver.py Modified: branches/FAIL2BAN-0_8/server/asyncserver.py =================================================================== --- branches/FAIL2BAN-0_8/server/asyncserver.py 2007-12-16 21:38:04 UTC (rev 635) +++ branches/FAIL2BAN-0_8/server/asyncserver.py 2007-12-17 19:53:33 UTC (rev 636) @@ -25,7 +25,7 @@ __license__ = "GPL" from pickle import dumps, loads, HIGHEST_PROTOCOL -import asyncore, asynchat, socket, os, logging, sys +import asyncore, asynchat, socket, os, logging # Gets the instance of the logger. logSys = logging.getLogger("fail2ban.server") @@ -46,7 +46,6 @@ self.__buffer = [] # Sets the terminator. self.set_terminator(RequestHandler.END_STRING) - self.found_terminator = self.handle_request_line def collect_incoming_data(self, data): logSys.debug("Received raw data: " + str(data)) @@ -57,7 +56,7 @@ # # This method is called once we have a complete request. - def handle_request_line(self): + def found_terminator(self): # Joins the buffer items. message = loads("".join(self.__buffer)) # Gives the message to the transmitter. @@ -125,12 +124,15 @@ # Creates the socket. self.create_socket(socket.AF_UNIX, socket.SOCK_STREAM) self.set_reuse_addr() - self.bind(sock) + try: + self.bind(sock) + except Exception: + raise AsyncServerException("Unable to bind socket %s" % self.__sock) self.listen(1) # Sets the init flag. self.__init = True # TODO Add try..catch - asyncore.loop(timeout = 2) + asyncore.loop() ## # Stops the communication server. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |