SF.net SVN: fclient: [209] trunk/sandbox/fcp/fcp2_0_client.py

[<ju...@us...>]

Revision: 209
          http://fclient.svn.sourceforge.net/fclient/?rev=209&view=rev
Author:   jurner
Date:     2008-02-12 07:55:42 -0800 (Tue, 12 Feb 2008)

Log Message:
-----------
combed over logging

Modified Paths:
--------------
    trunk/sandbox/fcp/fcp2_0_client.py

Modified: trunk/sandbox/fcp/fcp2_0_client.py
===================================================================
--- trunk/sandbox/fcp/fcp2_0_client.py	2008-02-12 09:50:22 UTC (rev 208)
+++ trunk/sandbox/fcp/fcp2_0_client.py	2008-02-12 15:55:42 UTC (rev 209)
@@ -142,11 +142,6 @@
 
 # Todos
 #------------------------------------------------------------------------------------------------------------------------------------------------
-# logging
-#
-# logging is not very accurate. What to log at wich level? What details?
-#
-#------------------------------------------------------------------------------------------------------------------------------------------------
 # clean up
 #
 # x. move saveWriteFile and friends to a separate module
@@ -469,7 +464,8 @@
 		
 	
 	def _logEvent(self, event, request):
-		self._log.info(consts.LogMessages.EventTriggered + event.name)
+		if event != self.events.Idle: 
+			self._log.debug(consts.LogMessages.EventTriggered + event.name)
 			
 	###############################################################
 	##
@@ -1252,7 +1248,7 @@
 		"""
 		msg = self.Message.fromSocket(self._socket)
 		if msg.name == consts.Message.ClientSocketDied:
-			self._log.info(consts.LogMessages.SocketDied)
+			self._log.critical(consts.LogMessages.SocketDied)
 			if dispatch:
 				disconnectMsg = self.Message(
 						consts.Message.ClientDisconnected,
@@ -1333,7 +1329,7 @@
 		try:
 			msg.send(self._socket)
 		except socket.error, d:
-			self._log.info(consts.LogMessages.SocketDied)
+			self._log.critical(consts.LogMessages.SocketDied)
 			disconnectMsg = self.Message(
 					consts.Message.ClientDisconnected,
 					DisconnectReason=consts.DisconnectReason.SocketDied,
@@ -2197,14 +2193,24 @@
 #
 #*****************************************************************************
 if __name__ == '__main__':
+	
+	Dir = os.path.dirname(os.path.abspath(__file__))
+	
 	c = FcpClient(
 				connectionName='test',
 				debugVerbosity=consts.DebugVerbosity.Debug
 				)
+	log = c.getLogger()
+	fpath = os.path.join(Dir, 'test.log')
+	handler = logging.FileHandler(fpath, 'w')
+	logging.getLogger('').addHandler(handler)
 	
+	
 	nodeHello = c.connect()
 	if nodeHello is not None:
 				
+		
+		
 		#for i in xrange(10):
 		#	c.next()			
 		
@@ -2320,8 +2326,6 @@
 			identifier = c.chkPutFile(
 				fpath,
 				)
-			
-						
 			c.run()
 			#for i in xrange(500):
 			#	c.next()
@@ -2359,7 +2363,7 @@
 	
 		def testUskPutData():
 			def cb(event, request):
-				insertURI = request['InsertURI']
+				insertURI = request['FcPrivateKey']
 				insertURI = 'USK@AKva7OolWsdAICB8ZE1hDgFqBJigJpYN2edJd6deiApU,dOitAHZSrt27Tl4wK7F-VHVShJVvzR7eNWKsXBolq8k,AQECAAE/'
 				
 				


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