1
=== modified file 'lib/canonical/launchpad/webapp/pgsession.py'
2
--- lib/canonical/launchpad/webapp/pgsession.py	2009-06-25 05:30:52 +0000
3
+++ lib/canonical/launchpad/webapp/pgsession.py	2009-11-30 09:55:24 +0000
4
@@ -54,10 +54,11 @@
5
54
        pickle     bytea NOT NULL,
54
        pickle     bytea NOT NULL,
6
55
        CONSTRAINT sessiondata_key UNIQUE (client_id, product_id, key)
55
        CONSTRAINT sessiondata_key UNIQUE (client_id, product_id, key)
7
56
        );
56
        );
8
57
9
58
    Removing expired data needs to be done out of band.
10
57
    """
59
    """
11
58
    implements(ISessionDataContainer)
60
    implements(ISessionDataContainer)
12
59
61
13
60
    timeout = 60 * DAYS
14
61
    # If we have a low enough resolution, we can determine active users
62
    # If we have a low enough resolution, we can determine active users
15
62
    # using the session data.
63
    # using the session data.
16
63
    resolution = 9 * MINUTES
64
    resolution = 9 * MINUTES
17
@@ -67,7 +68,6 @@
18
67
68
19
68
    def __getitem__(self, client_id):
69
    def __getitem__(self, client_id):
20
69
        """See zope.session.interfaces.ISessionDataContainer"""
70
        """See zope.session.interfaces.ISessionDataContainer"""
21
70
        self._sweep()
22
71
        return PGSessionData(self, client_id)
71
        return PGSessionData(self, client_id)
23
72
72
24
73
    def __setitem__(self, client_id, session_data):
73
    def __setitem__(self, client_id, session_data):
25
@@ -76,23 +76,6 @@
26
76
        # themselves.
76
        # themselves.
27
77
        pass
77
        pass
28
78
78
29
79
    _last_sweep = datetime.utcnow()
30
80
    fuzz = 10 # Our sweeps may occur +- this many seconds to minimize races.
31
81
32
82
    def _sweep(self):
33
83
        interval = timedelta(
34
84
                seconds=self.resolution - self.fuzz + 2 * self.fuzz * random()
35
85
                )
36
86
        now = datetime.utcnow()
37
87
        if self._last_sweep + interval > now:
38
88
            return
39
89
        self._last_sweep = now
40
90
        query = """
41
91
            DELETE FROM SessionData WHERE last_accessed
42
92
                < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - '%d seconds'::interval
43
93
            """ % self.timeout
44
94
        self.store.execute(query, noresult=True)
45
95
46
96
79
47
97
class PGSessionData(PGSessionBase):
80
class PGSessionData(PGSessionBase):
48
98
    implements(ISessionData)
81
    implements(ISessionData)
49
99
82
50
=== modified file 'lib/canonical/launchpad/webapp/tests/test_pgsession.py'
51
--- lib/canonical/launchpad/webapp/tests/test_pgsession.py	2009-06-25 05:30:52 +0000
52
+++ lib/canonical/launchpad/webapp/tests/test_pgsession.py	2009-11-30 09:55:24 +0000
53
@@ -62,67 +62,6 @@
54
62
        self.failUnless(isinstance(session_data, PGSessionData))
62
        self.failUnless(isinstance(session_data, PGSessionData))
55
63
        self.failUnless(ISessionData.providedBy(session_data))
63
        self.failUnless(ISessionData.providedBy(session_data))
56
64
64
57
65
    def test_sweep(self):
58
66
        product_id = 'Product Id'
59
67
        client_id1 = 'Client Id #1'
60
68
        client_id2 = 'Client Id #2'
61
69
62
70
        store = self.sdc.store
63
71
64
72
        # Create a session
65
73
        session1 = self.sdc[client_id1]
66
74
        session2 = self.sdc[client_id2]
67
75
68
76
        # Store some session data to ensure we can clean up sessions
69
77
        # with data.
70
78
        spd = self.sdc[client_id1][product_id]
71
79
        spd['key'] = 'value'
72
80
73
81
        # Add and delete some data on the second client ID to ensure
74
82
        # that it exists in the database.
75
83
        session2._ensureClientId()
76
84
77
85
        # Do a quick sanity check.  Nothing has been stored for the
78
86
        # third client ID.
79
87
        result = store.execute(
80
88
            "SELECT client_id FROM SessionData ORDER BY client_id")
81
89
        client_ids = [row[0] for row in result]
82
90
        self.failUnlessEqual(client_ids, [client_id1, client_id2])
83
91
        result = store.execute("SELECT COUNT(*) FROM SessionPkgData")
84
92
        self.failUnlessEqual(result.get_one()[0], 1)
85
93
86
94
        # Push the session into the past. There is fuzzyness involved
87
95
        # in when the sweeping actually happens (to minimize concurrency
88
96
        # issues), so we just push it into the far past for testing.
89
97
        store.execute("""
90
98
            UPDATE SessionData
91
99
            SET last_accessed = last_accessed - '1 year'::interval
92
100
            WHERE client_id = ?
93
101
            """, (client_id1,), noresult=True)
94
102
95
103
        # Make the SessionDataContainer think it hasn't swept in a while
96
104
        self.sdc._last_sweep = self.sdc._last_sweep - timedelta(days=365)
97
105
98
106
        # Sweep happens automatically in __getitem__
99
107
        ignored_result = self.sdc[client_id2][product_id]
100
108
101
109
        # So the client_id1 session should now have been removed.
102
110
        result = store.execute(
103
111
            "SELECT client_id FROM SessionData ORDER BY client_id")
104
112
        client_ids = [row[0] for row in result]
105
113
        self.failUnlessEqual(client_ids, [client_id2])
106
114
107
115
        # __getitem__ does not cause a sweep though if  sweep has been
108
116
        # done recently, to minimize database queries.
109
117
        store.execute("""
110
118
            UPDATE SessionData
111
119
            SET last_accessed = last_accessed - '1 year'::interval
112
120
            """, noresult=True)
113
121
        session1._ensureClientId()
114
122
        session1 = self.sdc[client_id1]
115
123
        result = store.execute("SELECT COUNT(*) FROM SessionData")
116
124
        self.failUnlessEqual(result.get_one()[0], 2)
117
125
118
126
    def test_storage(self):
65
    def test_storage(self):
119
127
        client_id1 = 'Client Id #1'
66
        client_id1 = 'Client Id #1'
120
128
        client_id2 = 'Client Id #2'
67
        client_id2 = 'Client Id #2'
Reviewer	Review Type	Date Requested	Status
Guilherme Salgado (community)	release-critical	2009-11-30	Approve on 2009-12-01
Graham Binns (community)	code	2009-11-30	Approve on 2009-12-01
Review via email: mp+15403@code.launchpad.net