SF.net SVN: fclient: [379] trunk/sandbox/fcp2/client.py

[<jU...@us...>]

Revision: 379
          http://fclient.svn.sourceforge.net/fclient/?rev=379&view=rev
Author:   jUrner
Date:     2008-04-09 00:31:36 -0700 (Wed, 09 Apr 2008)

Log Message:
-----------
moved errors and loggers to consts for easier access

Modified Paths:
--------------
    trunk/sandbox/fcp2/client.py

Modified: trunk/sandbox/fcp2/client.py
===================================================================
--- trunk/sandbox/fcp2/client.py	2008-04-09 07:30:07 UTC (rev 378)
+++ trunk/sandbox/fcp2/client.py	2008-04-09 07:31:36 UTC (rev 379)
@@ -269,10 +269,6 @@
 		self._connectionName = self.setConnectionName(connectionName)
 		self._ddaTests = []				# currently running DDA tests (request0, ... requestN)
 		self.events = events.Events()
-		self._loggers = {
-				'Event': logging.getLogger(consts.LoggerNames.ClientEvents),
-				'Runtime': logging.getLogger(consts.LoggerNames.ClientRuntime),
-				}
 		self._nodeHelloMessage = None
 		self._requests = {}			# currently running requests (requestIdentifier --> request)
 		self.ioHandler = iohandler.IOHandler()
@@ -289,16 +285,16 @@
 	###############################################################
 	def _captureEvent(self, event, request):
 		if event != self.events.Idle: 
-			self._loggers['Event'].debug(consts.LogMessages.EventTriggered + event.name)
-	
-	
+			consts.Logger.Event.info(consts.LogMessages.EventTriggered + event.name)
+			
+		
 	def _close(self, msg):
 		"""Closes the client
 		@param msg: message to pass to the ClientDisconnected event or None to not inform listeners
 		
 		@todo: complain if the client is already closed?
 		"""
-		self._loggers['Runtime'].info(consts.LogMessages.Closing)
+		consts.Logger.Client.info(consts.LogMessages.Closing)
 				
 		# clean left over DDA test tmp files
 		for initialRequest in self._ddaTests:
@@ -548,19 +544,17 @@
 		"""Returns the current verbosity level of the client
 		@return: L{consts.DebugVerbosity}
 		"""
-		for logger in self._loggers.values():
-			return logger.getEffectiveLevel()
+		return consts.Logger.Client.getEffectiveLevel()
+		
 	
 	#TESTED
 	def setDebugVerbosity(self, debugVerbosity):
 		"""Sets the verbosity level of the client
 		@param debugVerbosity: L{consts.DebugVerbosity}
 		"""
-		for logger in self._loggers.values():
-			logger.setLevel(debugVerbosity)
-		self.ioHandler.setDebugVerbosity(debugVerbosity)
+		consts.Logger.Client.setLevel(debugVerbosity)
+			
 	
-	
 	#TESTED
 	def startNode(self, cmdline):
 		"""Starts the freenet node
@@ -1129,16 +1123,16 @@
 		"""
 		try:
 			msg = self.ioHandler.readMessage()
-		except self.ioHandler.IOTimeout, details:
+		except consts.IOTimeoutError, details:
 			msg = message.ClientSocketTimeout()
 			if dispatch:
 				self.events.Idle(msg)
-		except self.ioHandler.IOBroken, details:
+		except consts.IOBrokenError, details:
 			msg = message.ClientDisconnected(
 						DisconnectReason=consts.DisconnectReason.ConnectionDied,
 						)
 			self._close(msg)
-			raise self.ioHandler.IOBroken(details)
+			raise consts.IOBrokenError(details)
 		else:
 			if dispatch:
 				self.handleMessage(msg)
@@ -1157,7 +1151,7 @@
 			try:
 				msg = self.next()
 			except KeyboardInterrupt:
-				self._loggers['Runtime'].info(consts.LogMessages.KeyboardInterrupt)
+				consts.Logger.Client.info(consts.LogMessages.KeyboardInterrupt)
 				return
 			if msg == message.ClientSocketDied:
 				return
@@ -1175,13 +1169,13 @@
 					break
 				
 			if not haveRunningRequests:
-				self._loggers['Runtime'].info(consts.LogMessages.AllRequestsCompleted)
+				consts.Logger.Client.info(consts.LogMessages.AllRequestsCompleted)
 				break
 			
 			try:
 				msg = self.next()
 			except KeyboardInterrupt:
-				self._loggers['Runtime'].info(consts.LogMessages.KeyboardInterrupt)
+				sconsts.Logger.Client.info(consts.LogMessages.KeyboardInterrupt)
 				break
 			
 			if msg == message.ClientSocketDied:
@@ -1204,12 +1198,12 @@
 		# ...so assume data was send, cos there is no way to proove it was not send
 		try:
 			self.ioHandler.sendMessage(msg)
-		except self.ioHandler.IOBroken, details:
+		except consts.IOBrokenError, details:
 			errorMsg = message.ClientDisconnected(
 					DisconnectReason=consts.DisconnectReason.ConnectionDied,
 					)
 			self._close(errorMsg)
-			raise self.ioHandler.IOBroken(details)
+			raise consts.IOBrokenError(details)
 			
 	#########################################################
 	##


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.