[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [25414] trunk/blender/release/scripts/io/ netrender: netrender: use reports to send error or success messages when sending jobs to server.

[Martin Poirier]

Revision: 25414
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=25414
Author:   theeth
Date:     2009-12-16 19:26:27 +0100 (Wed, 16 Dec 2009)

Log Message:
-----------
netrender: use reports to send error or success messages when sending jobs to server.

Modified Paths:
--------------
    trunk/blender/release/scripts/io/netrender/operators.py
    trunk/blender/release/scripts/io/netrender/utils.py

Modified: trunk/blender/release/scripts/io/netrender/operators.py
===================================================================
--- trunk/blender/release/scripts/io/netrender/operators.py	2009-12-16 17:49:51 UTC (rev 25413)
+++ trunk/blender/release/scripts/io/netrender/operators.py	2009-12-16 18:26:27 UTC (rev 25414)
@@ -97,12 +97,15 @@
 		scene = context.scene
 		netsettings = scene.network_render
 		
-		conn = clientConnection(netsettings.server_address, netsettings.server_port)
-		
-		if conn:
+		try:
+			conn = clientConnection(netsettings.server_address, netsettings.server_port)
+
 			# Sending file
 			scene.network_render.job_id = client.clientSendJob(conn, scene, True)
 			conn.close()
+		except Exception as err:
+			self.report('ERROR', str(err))
+			conn = None
 		
 		bpy.ops.screen.render('INVOKE_AREA', animation=True)
 		
@@ -124,13 +127,17 @@
 		scene = context.scene
 		netsettings = scene.network_render
 		
-		conn = clientConnection(netsettings.server_address, netsettings.server_port)
-		
-		if conn:
+		try:
+			conn = clientConnection(netsettings.server_address, netsettings.server_port)
+
 			# Sending file
 			scene.network_render.job_id = client.clientSendJob(conn, scene, True)
 			conn.close()
+			self.report('INFO', "Job sent to master")
+		except Exception as err:
+			self.report('ERROR', str(err))
 		
+		
 		return ('FINISHED',)
 	
 	def invoke(self, context, event):

Modified: trunk/blender/release/scripts/io/netrender/utils.py
===================================================================
--- trunk/blender/release/scripts/io/netrender/utils.py	2009-12-16 17:49:51 UTC (rev 25413)
+++ trunk/blender/release/scripts/io/netrender/utils.py	2009-12-16 18:26:27 UTC (rev 25414)
@@ -90,7 +90,7 @@
 			return conn
 		else:
 			conn.close()
-			return None
+			raise IOError("Wrong version on master")
 
 def clientVerifyVersion(conn):
 	conn.request("GET", "/version")