Changeset 2595

Timestamp:

07/05/08 22:16:06 (8 weeks ago)

Author:

jmoore

Message:

ticket:1018 - Fixes to omero.client but fails on destroySession()

This does not work since the context is not propagated on
router.destroySession() to session.destroy(). See:

http://www.zeroc.com/forums/help-center/2007-question-about-glacier2.html

Location:

trunk

Files:

• components/tools/OmeroPy/src/omero/__init__.py (modified) (6 diffs)
• etc/grid/templates.xml (modified) (1 diff)

trunk/components/tools/OmeroPy/src/omero/__init__.py

@@ -19 +19 @@
 import omero_Constants_ice
 import uuid
+import omero.constants
 
 class client(object):
@@ -39 +40 @@
         self.of.registerObjectFactory(self.ic)
         # Define our unique identifier (used during close/detach)
-        self.ic.getImplicitContext().put(omero.constants.CLIENT_UUID, str(uuid.uuid4()))
+        self.ic.getImplicitContext().put(omero.constants.CLIENTUUID, str(uuid.uuid4()))
 
     def __del__(self):
         try:
-            self.destroyConnection()
+            self.closeSession()
         except exceptions.Exception, e:
             print "Ignoring error in client.__del__:" + str(e.__class__)
+            traceback.print_exc()
 
     def getCommunicator(self):
@@ -66 +68 @@
     def createSession(self, username=None, password=None):
         import omero
+
+        # Check the required properties
         if not username:
             username = self.getProperty("omero.user")
@@ -79 +83 @@
             raise ClientError("No password specified")
 
+        # Acquire router and get the proxy
+        # For whatever reason, we have to set the context
+        # on the router context here as well.
         prx = self.ic.getDefaultRouter()
         if not prx:
             raise ClientError("No default router found.")
+        prx = prx.ice_context(self.ic.getImplicitContext().getContext())
         router = Glacier2.RouterPrx.checkedCast(prx)
         if not router:
             raise ClientError("Error obtaining Glacier2 router.")
         session = router.createSession(username, password)
+        if not session:
+            raise ClientError("Obtained null object proxy")
+
+        # Check type
         self.sf = api.ServiceFactoryPrx.checkedCast(session)
         if not self.sf:
-            raise ClientError("No session obtained.")
+            raise ClientError("Obtained object proxy is not a ServiceFactory")
         return self.sf
 
@@ -208 +220 @@
 
         # If 'sf' exists we remove it.
-        if not hasattr(self, 'sf'):
+        if hasattr(self, 'sf'):
             self.sf = None
 
@@ -215 +227 @@
             return
 
-        prx = self.ic.getDefaultRouter()
-        router = Glacier2.RouterPrx.checkedCast(prx)
-
-        # Now destroy the actual session if possible,
-        # which will always trigger an exception,
-        # regardless of actually being connected or not
-        if router:
+        try:
+            prx = self.ic.getDefaultRouter()
+            router = Glacier2.RouterPrx.checkedCast(prx)
+
+            # Now destroy the actual session if possible,
+            # which will always trigger an exception,
+            # regardless of actually being connected or not
+            if router:
+                try:
+                    router.destroySession()
+                except exceptions.Exception, e:
+                    pass
+                    # SNEE happens if we call sf.close() before
+                    # calling destroySession(). CLE happens since
+                    # we are disconnecting
+
             try:
-                router.destroySession()
-            except exceptions.Exception, e:
-                pass
-                # SNEE happens if we call sf.close() before
-                # calling destroySession(). CLE happens since
-                # we are disconnecting
-
-        try:
-            self.ic.destroy()
-        except (), msg:
-            pysys.stderr.write("Ice exception while destroying communicator:")
-            pysys.stderr.write(msg)
-        self.ic = None
+                self.ic.destroy()
+            except (), msg:
+                pysys.stderr.write("Ice exception while destroying communicator:")
+                pysys.stderr.write(msg)
+        finally:
+            self.ic = None
 
     def _env(self, method, *args):

trunk/etc/grid/templates.xml

@@ -93 +93 @@
            <property name="Glacier2.PermissionsVerifier" value="BlitzVerifier@BlitzAdapters"/>
            <property name="Glacier2.SessionManager" value="BlitzManager@BlitzAdapters"/>
+           <property name="Glacier2.Client.ForwardContext" value="1"/>
            <property name="Ice.MessageSizeMax" value="4096"/>
          </properties>