Changeset 872

Timestamp:

07/20/06 17:26:51 (7 years ago)

Author:

mglb1

Message:

• Keep the list of sessions as a property of the ccsd_session class

rather than as a global variable.

• Remove yourself from the list when shudown() is caleed on a session instance
• Remove XXX comment about checking for duplicate sessions when initialising. If you want this behaviour use the startSession function

File:

• ccsd/trunk/crcnetd/_utils/ccsd_session.py (modified) (20 diffs)

ccsd/trunk/crcnetd/_utils/ccsd_session.py

@@ -56 +56 @@
     
     """
-    
+
+    # Currently active sessions
+    sessions = {}
+
     timeout = config_get("session", "timeout", DEFAULT_SESSION_TIMEOUT)
     cookie_timeout = config_get("session", "cookie_timeout", \
@@ -82 +85 @@
         else:
             self.token = token
-
-        # XXX: Check that there is not another session already open for
-        # this user!
         
         # Setup a database connection  
@@ -111 +111 @@
         else:
             self.session_id = sid
-
+        
         # No changeset or revision active initially
         self.changeset = 0
@@ -519 +519 @@
         self.db.close()
         
+        del self.sessions[self.session_id]
         log_info("Session #%s (%s) shutdown." % \
                (self.session_id, self.username))
@@ -616 +617 @@
         self.db.close()
         
+        del self.sessions[self.session_id] 
         log_info("Session #%s (%s) shutdown." % \
                (self.session_id, self.username))
@@ -655 +657 @@
     """Returns a session object for the specified session"""
 
-    if session_id not in _sessions.keys():
+    if session_id not in ccsd_session.sessions.keys():
         return None
     
-    return _sessions[session_id]
+    return ccsd_session.sessions[session_id]
 
 def getSessionE(session_id):
@@ -667 +669 @@
     """
 
-    if session_id not in _sessions.keys():
+    if session_id not in ccsd_session.sessions.keys():
         raise ccsd_session_error("Session does not exist!")
     
-    return _sessions[session_id]
+    return ccsd_session.sessions[session_id]
 
 @exportViaXMLRPC(SESSION_NONE, AUTH_NONE)
@@ -694 +696 @@
 
     # Validate the session parameters
-    if sauth["session_id"] not in _sessions.keys():
+    if sauth["session_id"] not in ccsd_session.sessions.keys():
         return SESSION_NONE
-    session = _sessions[sauth["session_id"]]
+    session = ccsd_session.sessions[sauth["session_id"]]
     if session.username != sauth["username"]:
         raise ccsd_session_error("Session username does not match!")
@@ -704 +706 @@
     # Update the expiry time
     session.updateExpiry()
-    _sessions[sauth["session_id"]] = session
+    ccsd_session.sessions[sauth["session_id"]] = session
     
     # Must be ok
@@ -714 +716 @@
 
     # Loop through the list of sessions and remove expired ones
-    for sessionID,session in _sessions.items():
+    for sessionID,session in ccsd_session.sessions.items():
         # Never expire the admin session
         if sessionID==ADMIN_SESSION_ID: continue
         rv = session.isExpired()
         if rv == 1:
-            del _sessions[sessionID]
+            del ccsd_session.sessions[sessionID]
 
     # Also delete expired login cookies
@@ -733 +735 @@
     program restarts.
     """
-    for sessionID,session in _sessions.items():
+    for sessionID,session in ccsd_session.sessions.items():
         session.close(persist=True)
 
@@ -794 +796 @@
     
     # Check for existing sessions
-    for sess_id, sess in _sessions.items():
+    for sess_id, sess in ccsd_session.sessions.items():
         # Skip the administrative session
         if sess_id == ADMIN_SESSION_ID:
@@ -809 +811 @@
                     "session_id=%s", (SESSION_RW, sess_id))
             sess.mode = SESSION_RW
-            _sessions[sess_id] = sess
+            ccsd_session.sessions[sess_id] = sess
             return sess.getSessionObject()
 
@@ -818 +820 @@
     # Register it in the list of sessions
     obj = newsession.getSessionObject()
-    _sessions[obj["sessionID"]] = newsession
+    ccsd_session.sessions[obj["sessionID"]] = newsession
 
     # Check for first_login 
@@ -835 +837 @@
     newsession = ccsd_basic_session(username, mode)
     obj = newsession.getSessionObject()
-    _sessions[obj["sessionID"]] = newsession
+    ccsd_session.sessions[obj["sessionID"]] = newsession
     
     return obj
@@ -903 +905 @@
     session.shutdown()
 
-    # Remove from the list
-    del _sessions[session_id]
-    
     return 0
 
@@ -964 +963 @@
 
     count = 0
-    for session_id2,tsession in _sessions.items():
+    for session_id2,tsession in ccsd_session.sessions.items():
         if session_id2 == session_id:
             continue
@@ -984 +983 @@
 @exportViaXMLRPC(SESSION_NONE, AUTH_NONE)
 def getNoSessions():
-    return len(_sessions)
+    return len(ccsd_session.sessions)
 
 @exportViaXMLRPC(SESSION_NONE, AUTH_NONE)
@@ -995 +994 @@
 # Session Initialisation 
 #####################################################################
-_sessions = {}
 def initSessions():
     try:
@@ -1009 +1007 @@
 
         # Create a program wide 'admin' session which is always present
-        _sessions[ADMIN_SESSION_ID] = ccsd_session("admin", SESSION_RW, "", 
-                -1, -1, ADMIN_SESSION_ID)
+        ccsd_session.sessions[ADMIN_SESSION_ID] = \
+                ccsd_session("admin", SESSION_RW, "", -1, -1, ADMIN_SESSION_ID)
 
         # Load any other saved sessions
-        _sessions.update(loadSessions())
+        ccsd_session.sessions.update(loadSessions())
 
         log_info("Successfully loaded sessions")