Mercurial > gemma

annotate auth/pool.go @ 220:11d1a488b08f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Depend command line parsing on Viper/Cobra. Configuration should be persistent now.
author Sascha L. Teichmann <sascha.teichmann@intevation.de>
date Tue, 24 Jul 2018 17:45:17 +0200
parents 2fad2931a5a6
children 9012e4045da4
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
190
3457a60fb12d Added stub for a persistent session store.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents:
diff changeset
1 package auth
3457a60fb12d Added stub for a persistent session store.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents:
diff changeset
2
3457a60fb12d Added stub for a persistent session store.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents:
diff changeset
3 import (
193
1585c334e8a7 More on persisting sessions.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 190
diff changeset
4 "bytes"
190
3457a60fb12d Added stub for a persistent session store.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents:
diff changeset
5 "database/sql"
3457a60fb12d Added stub for a persistent session store.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents:
diff changeset
6 "log"
193
1585c334e8a7 More on persisting sessions.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 190
diff changeset
7 "time"
1585c334e8a7 More on persisting sessions.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 190
diff changeset
8
1585c334e8a7 More on persisting sessions.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 190
diff changeset
9 bolt "github.com/coreos/bbolt"
190
3457a60fb12d Added stub for a persistent session store.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents:
diff changeset
10 )
3457a60fb12d Added stub for a persistent session store.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents:
diff changeset
11
220
11d1a488b08f Depend command line parsing on Viper/Cobra. Configuration should be persistent now.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 213
diff changeset
12 // ConnPool is the global connection pool.
11d1a488b08f Depend command line parsing on Viper/Cobra. Configuration should be persistent now.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 213
diff changeset
13 var ConnPool *ConnectionPool
11d1a488b08f Depend command line parsing on Viper/Cobra. Configuration should be persistent now.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 213
diff changeset
14
204
3d0988d9f867 De-virtualize the connection pool implementation.
Sascha L. Teichmann <teichmann@intevation.de>
parents: 203
diff changeset
15 type ConnectionPool struct {
3d0988d9f867 De-virtualize the connection pool implementation.
Sascha L. Teichmann <teichmann@intevation.de>
parents: 203
diff changeset
16 storage *bolt.DB
3d0988d9f867 De-virtualize the connection pool implementation.
Sascha L. Teichmann <teichmann@intevation.de>
parents: 203
diff changeset
17 conns map[string]*Connection
3d0988d9f867 De-virtualize the connection pool implementation.
Sascha L. Teichmann <teichmann@intevation.de>
parents: 203
diff changeset
18 cmds chan func(*ConnectionPool)
190
3457a60fb12d Added stub for a persistent session store.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents:
diff changeset
19 }
3457a60fb12d Added stub for a persistent session store.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents:
diff changeset
20
193
1585c334e8a7 More on persisting sessions.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 190
diff changeset
21 var sessionsBucket = []byte("sessions")
1585c334e8a7 More on persisting sessions.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 190
diff changeset
22
204
3d0988d9f867 De-virtualize the connection pool implementation.
Sascha L. Teichmann <teichmann@intevation.de>
parents: 203
diff changeset
23 func NewConnectionPool(filename string) (*ConnectionPool, error) {
3d0988d9f867 De-virtualize the connection pool implementation.
Sascha L. Teichmann <teichmann@intevation.de>
parents: 203
diff changeset
24
3d0988d9f867 De-virtualize the connection pool implementation.
Sascha L. Teichmann <teichmann@intevation.de>
parents: 203
diff changeset
25 pcp := &ConnectionPool{
213
2fad2931a5a6 Fix for [issue78] gemma back end broken for me since 213:3d0988d9f867
Sascha L. Teichmann <teichmann@intevation.de>
parents: 205
diff changeset
26 conns: make(map[string]*Connection),
2fad2931a5a6 Fix for [issue78] gemma back end broken for me since 213:3d0988d9f867
Sascha L. Teichmann <teichmann@intevation.de>
parents: 205
diff changeset
27 cmds: make(chan func(*ConnectionPool)),
204
3d0988d9f867 De-virtualize the connection pool implementation.
Sascha L. Teichmann <teichmann@intevation.de>
parents: 203
diff changeset
28 }
3d0988d9f867 De-virtualize the connection pool implementation.
Sascha L. Teichmann <teichmann@intevation.de>
parents: 203
diff changeset
29 if err := pcp.openStorage(filename); err != nil {
3d0988d9f867 De-virtualize the connection pool implementation.
Sascha L. Teichmann <teichmann@intevation.de>
parents: 203
diff changeset
30 return nil, err
3d0988d9f867 De-virtualize the connection pool implementation.
Sascha L. Teichmann <teichmann@intevation.de>
parents: 203
diff changeset
31 }
3d0988d9f867 De-virtualize the connection pool implementation.
Sascha L. Teichmann <teichmann@intevation.de>
parents: 203
diff changeset
32 go pcp.run()
3d0988d9f867 De-virtualize the connection pool implementation.
Sascha L. Teichmann <teichmann@intevation.de>
parents: 203
diff changeset
33 return pcp, nil
3d0988d9f867 De-virtualize the connection pool implementation.
Sascha L. Teichmann <teichmann@intevation.de>
parents: 203
diff changeset
34 }
3d0988d9f867 De-virtualize the connection pool implementation.
Sascha L. Teichmann <teichmann@intevation.de>
parents: 203
diff changeset
35
3d0988d9f867 De-virtualize the connection pool implementation.
Sascha L. Teichmann <teichmann@intevation.de>
parents: 203
diff changeset
36 // openStorage opens a storage file.
3d0988d9f867 De-virtualize the connection pool implementation.
Sascha L. Teichmann <teichmann@intevation.de>
parents: 203
diff changeset
37 func (pcp *ConnectionPool) openStorage(filename string) error {
3d0988d9f867 De-virtualize the connection pool implementation.
Sascha L. Teichmann <teichmann@intevation.de>
parents: 203
diff changeset
38
3d0988d9f867 De-virtualize the connection pool implementation.
Sascha L. Teichmann <teichmann@intevation.de>
parents: 203
diff changeset
39 // No file, nothing to restore/persist.
3d0988d9f867 De-virtualize the connection pool implementation.
Sascha L. Teichmann <teichmann@intevation.de>
parents: 203
diff changeset
40 if filename == "" {
3d0988d9f867 De-virtualize the connection pool implementation.
Sascha L. Teichmann <teichmann@intevation.de>
parents: 203
diff changeset
41 return nil
3d0988d9f867 De-virtualize the connection pool implementation.
Sascha L. Teichmann <teichmann@intevation.de>
parents: 203
diff changeset
42 }
190
3457a60fb12d Added stub for a persistent session store.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents:
diff changeset
43
193
1585c334e8a7 More on persisting sessions.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 190
diff changeset
44 db, err := bolt.Open(filename, 0600, nil)
1585c334e8a7 More on persisting sessions.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 190
diff changeset
45 if err != nil {
204
3d0988d9f867 De-virtualize the connection pool implementation.
Sascha L. Teichmann <teichmann@intevation.de>
parents: 203
diff changeset
46 return err
193
1585c334e8a7 More on persisting sessions.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 190
diff changeset
47 }
1585c334e8a7 More on persisting sessions.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 190
diff changeset
48
1585c334e8a7 More on persisting sessions.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 190
diff changeset
49 err = db.Update(func(tx *bolt.Tx) error {
1585c334e8a7 More on persisting sessions.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 190
diff changeset
50 b, err := tx.CreateBucketIfNotExists(sessionsBucket)
1585c334e8a7 More on persisting sessions.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 190
diff changeset
51 if err != nil {
1585c334e8a7 More on persisting sessions.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 190
diff changeset
52 return err
1585c334e8a7 More on persisting sessions.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 190
diff changeset
53 }
1585c334e8a7 More on persisting sessions.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 190
diff changeset
54
1585c334e8a7 More on persisting sessions.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 190
diff changeset
55 // pre-load sessions
1585c334e8a7 More on persisting sessions.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 190
diff changeset
56 c := b.Cursor()
1585c334e8a7 More on persisting sessions.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 190
diff changeset
57
1585c334e8a7 More on persisting sessions.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 190
diff changeset
58 for k, v := c.First(); k != nil; k, v = c.Next() {
1585c334e8a7 More on persisting sessions.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 190
diff changeset
59 var conn Connection
197
e85413e5befa Cleaned up serialisation/deserilisation of sessions a bit.
Sascha L. Teichmann <teichmann@intevation.de>
parents: 193
diff changeset
60 if err := conn.deserialize(bytes.NewReader(v)); err != nil {
193
1585c334e8a7 More on persisting sessions.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 190
diff changeset
61 return err
1585c334e8a7 More on persisting sessions.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 190
diff changeset
62 }
213
2fad2931a5a6 Fix for [issue78] gemma back end broken for me since 213:3d0988d9f867
Sascha L. Teichmann <teichmann@intevation.de>
parents: 205
diff changeset
63 pcp.conns[string(k)] = &conn
193
1585c334e8a7 More on persisting sessions.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 190
diff changeset
64 }
1585c334e8a7 More on persisting sessions.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 190
diff changeset
65
1585c334e8a7 More on persisting sessions.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 190
diff changeset
66 return nil
1585c334e8a7 More on persisting sessions.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 190
diff changeset
67 })
1585c334e8a7 More on persisting sessions.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 190
diff changeset
68
1585c334e8a7 More on persisting sessions.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 190
diff changeset
69 if err != nil {
1585c334e8a7 More on persisting sessions.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 190
diff changeset
70 db.Close()
204
3d0988d9f867 De-virtualize the connection pool implementation.
Sascha L. Teichmann <teichmann@intevation.de>
parents: 203
diff changeset
71 return err
193
1585c334e8a7 More on persisting sessions.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 190
diff changeset
72 }
1585c334e8a7 More on persisting sessions.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 190
diff changeset
73
204
3d0988d9f867 De-virtualize the connection pool implementation.
Sascha L. Teichmann <teichmann@intevation.de>
parents: 203
diff changeset
74 pcp.storage = db
3d0988d9f867 De-virtualize the connection pool implementation.
Sascha L. Teichmann <teichmann@intevation.de>
parents: 203
diff changeset
75 return nil
190
3457a60fb12d Added stub for a persistent session store.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents:
diff changeset
76 }
3457a60fb12d Added stub for a persistent session store.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents:
diff changeset
77
204
3d0988d9f867 De-virtualize the connection pool implementation.
Sascha L. Teichmann <teichmann@intevation.de>
parents: 203
diff changeset
78 func (pcp *ConnectionPool) run() {
193
1585c334e8a7 More on persisting sessions.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 190
diff changeset
79 for {
1585c334e8a7 More on persisting sessions.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 190
diff changeset
80 select {
1585c334e8a7 More on persisting sessions.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 190
diff changeset
81 case cmd := <-pcp.cmds:
1585c334e8a7 More on persisting sessions.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 190
diff changeset
82 cmd(pcp)
1585c334e8a7 More on persisting sessions.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 190
diff changeset
83 case <-time.After(time.Minute):
1585c334e8a7 More on persisting sessions.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 190
diff changeset
84 pcp.cleanDB()
1585c334e8a7 More on persisting sessions.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 190
diff changeset
85 case <-time.After(time.Minute * 5):
1585c334e8a7 More on persisting sessions.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 190
diff changeset
86 pcp.cleanToken()
1585c334e8a7 More on persisting sessions.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 190
diff changeset
87 }
1585c334e8a7 More on persisting sessions.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 190
diff changeset
88 }
1585c334e8a7 More on persisting sessions.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 190
diff changeset
89 }
1585c334e8a7 More on persisting sessions.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 190
diff changeset
90
204
3d0988d9f867 De-virtualize the connection pool implementation.
Sascha L. Teichmann <teichmann@intevation.de>
parents: 203
diff changeset
91 func (pcp *ConnectionPool) cleanDB() {
203
6a802aed7f99 Persistent session store: Implemented cleanDB/cleanToken.
Sascha L. Teichmann <teichmann@intevation.de>
parents: 202
diff changeset
92 valid := time.Now().Add(-maxDBIdle)
6a802aed7f99 Persistent session store: Implemented cleanDB/cleanToken.
Sascha L. Teichmann <teichmann@intevation.de>
parents: 202
diff changeset
93 for _, con := range pcp.conns {
6a802aed7f99 Persistent session store: Implemented cleanDB/cleanToken.
Sascha L. Teichmann <teichmann@intevation.de>
parents: 202
diff changeset
94 if con.refCount <= 0 && con.last().Before(valid) {
6a802aed7f99 Persistent session store: Implemented cleanDB/cleanToken.
Sascha L. Teichmann <teichmann@intevation.de>
parents: 202
diff changeset
95 con.close()
6a802aed7f99 Persistent session store: Implemented cleanDB/cleanToken.
Sascha L. Teichmann <teichmann@intevation.de>
parents: 202
diff changeset
96 }
6a802aed7f99 Persistent session store: Implemented cleanDB/cleanToken.
Sascha L. Teichmann <teichmann@intevation.de>
parents: 202
diff changeset
97 }
193
1585c334e8a7 More on persisting sessions.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 190
diff changeset
98 }
1585c334e8a7 More on persisting sessions.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 190
diff changeset
99
204
3d0988d9f867 De-virtualize the connection pool implementation.
Sascha L. Teichmann <teichmann@intevation.de>
parents: 203
diff changeset
100 func (pcp *ConnectionPool) cleanToken() {
203
6a802aed7f99 Persistent session store: Implemented cleanDB/cleanToken.
Sascha L. Teichmann <teichmann@intevation.de>
parents: 202
diff changeset
101 now := time.Now()
6a802aed7f99 Persistent session store: Implemented cleanDB/cleanToken.
Sascha L. Teichmann <teichmann@intevation.de>
parents: 202
diff changeset
102 for token, con := range pcp.conns {
6a802aed7f99 Persistent session store: Implemented cleanDB/cleanToken.
Sascha L. Teichmann <teichmann@intevation.de>
parents: 202
diff changeset
103 expires := time.Unix(con.session.ExpiresAt, 0)
6a802aed7f99 Persistent session store: Implemented cleanDB/cleanToken.
Sascha L. Teichmann <teichmann@intevation.de>
parents: 202
diff changeset
104 if expires.Before(now) {
6a802aed7f99 Persistent session store: Implemented cleanDB/cleanToken.
Sascha L. Teichmann <teichmann@intevation.de>
parents: 202
diff changeset
105 // TODO: Be more graceful here?
6a802aed7f99 Persistent session store: Implemented cleanDB/cleanToken.
Sascha L. Teichmann <teichmann@intevation.de>
parents: 202
diff changeset
106 con.close()
6a802aed7f99 Persistent session store: Implemented cleanDB/cleanToken.
Sascha L. Teichmann <teichmann@intevation.de>
parents: 202
diff changeset
107 delete(pcp.conns, token)
6a802aed7f99 Persistent session store: Implemented cleanDB/cleanToken.
Sascha L. Teichmann <teichmann@intevation.de>
parents: 202
diff changeset
108 pcp.remove(token)
6a802aed7f99 Persistent session store: Implemented cleanDB/cleanToken.
Sascha L. Teichmann <teichmann@intevation.de>
parents: 202
diff changeset
109 }
6a802aed7f99 Persistent session store: Implemented cleanDB/cleanToken.
Sascha L. Teichmann <teichmann@intevation.de>
parents: 202
diff changeset
110 }
193
1585c334e8a7 More on persisting sessions.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 190
diff changeset
111 }
1585c334e8a7 More on persisting sessions.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 190
diff changeset
112
204
3d0988d9f867 De-virtualize the connection pool implementation.
Sascha L. Teichmann <teichmann@intevation.de>
parents: 203
diff changeset
113 func (pcp *ConnectionPool) remove(token string) {
3d0988d9f867 De-virtualize the connection pool implementation.
Sascha L. Teichmann <teichmann@intevation.de>
parents: 203
diff changeset
114 if pcp.storage == nil {
3d0988d9f867 De-virtualize the connection pool implementation.
Sascha L. Teichmann <teichmann@intevation.de>
parents: 203
diff changeset
115 return
3d0988d9f867 De-virtualize the connection pool implementation.
Sascha L. Teichmann <teichmann@intevation.de>
parents: 203
diff changeset
116 }
3d0988d9f867 De-virtualize the connection pool implementation.
Sascha L. Teichmann <teichmann@intevation.de>
parents: 203
diff changeset
117 err := pcp.storage.Update(func(tx *bolt.Tx) error {
200
8426a92fda00 Persistent session store: Implmented Renew.
Sascha L. Teichmann <teichmann@intevation.de>
parents: 199
diff changeset
118 b := tx.Bucket(sessionsBucket)
8426a92fda00 Persistent session store: Implmented Renew.
Sascha L. Teichmann <teichmann@intevation.de>
parents: 199
diff changeset
119 return b.Delete([]byte(token))
8426a92fda00 Persistent session store: Implmented Renew.
Sascha L. Teichmann <teichmann@intevation.de>
parents: 199
diff changeset
120 })
8426a92fda00 Persistent session store: Implmented Renew.
Sascha L. Teichmann <teichmann@intevation.de>
parents: 199
diff changeset
121 if err != nil {
8426a92fda00 Persistent session store: Implmented Renew.
Sascha L. Teichmann <teichmann@intevation.de>
parents: 199
diff changeset
122 log.Printf("error: %v\n", err)
8426a92fda00 Persistent session store: Implmented Renew.
Sascha L. Teichmann <teichmann@intevation.de>
parents: 199
diff changeset
123 }
8426a92fda00 Persistent session store: Implmented Renew.
Sascha L. Teichmann <teichmann@intevation.de>
parents: 199
diff changeset
124 }
8426a92fda00 Persistent session store: Implmented Renew.
Sascha L. Teichmann <teichmann@intevation.de>
parents: 199
diff changeset
125
204
3d0988d9f867 De-virtualize the connection pool implementation.
Sascha L. Teichmann <teichmann@intevation.de>
parents: 203
diff changeset
126 func (pcp *ConnectionPool) Delete(token string) bool {
193
1585c334e8a7 More on persisting sessions.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 190
diff changeset
127 res := make(chan bool)
204
3d0988d9f867 De-virtualize the connection pool implementation.
Sascha L. Teichmann <teichmann@intevation.de>
parents: 203
diff changeset
128 pcp.cmds <- func(pcp *ConnectionPool) {
193
1585c334e8a7 More on persisting sessions.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 190
diff changeset
129 conn, found := pcp.conns[token]
1585c334e8a7 More on persisting sessions.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 190
diff changeset
130 if !found {
1585c334e8a7 More on persisting sessions.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 190
diff changeset
131 res <- false
1585c334e8a7 More on persisting sessions.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 190
diff changeset
132 return
1585c334e8a7 More on persisting sessions.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 190
diff changeset
133 }
1585c334e8a7 More on persisting sessions.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 190
diff changeset
134 conn.close()
1585c334e8a7 More on persisting sessions.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 190
diff changeset
135 delete(pcp.conns, token)
200
8426a92fda00 Persistent session store: Implmented Renew.
Sascha L. Teichmann <teichmann@intevation.de>
parents: 199
diff changeset
136 pcp.remove(token)
193
1585c334e8a7 More on persisting sessions.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 190
diff changeset
137 res <- true
1585c334e8a7 More on persisting sessions.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 190
diff changeset
138 }
1585c334e8a7 More on persisting sessions.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 190
diff changeset
139 return <-res
190
3457a60fb12d Added stub for a persistent session store.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents:
diff changeset
140 }
3457a60fb12d Added stub for a persistent session store.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents:
diff changeset
141
204
3d0988d9f867 De-virtualize the connection pool implementation.
Sascha L. Teichmann <teichmann@intevation.de>
parents: 203
diff changeset
142 func (pcp *ConnectionPool) store(token string, con *Connection) {
3d0988d9f867 De-virtualize the connection pool implementation.
Sascha L. Teichmann <teichmann@intevation.de>
parents: 203
diff changeset
143 if pcp.storage == nil {
3d0988d9f867 De-virtualize the connection pool implementation.
Sascha L. Teichmann <teichmann@intevation.de>
parents: 203
diff changeset
144 return
3d0988d9f867 De-virtualize the connection pool implementation.
Sascha L. Teichmann <teichmann@intevation.de>
parents: 203
diff changeset
145 }
3d0988d9f867 De-virtualize the connection pool implementation.
Sascha L. Teichmann <teichmann@intevation.de>
parents: 203
diff changeset
146 err := pcp.storage.Update(func(tx *bolt.Tx) error {
200
8426a92fda00 Persistent session store: Implmented Renew.
Sascha L. Teichmann <teichmann@intevation.de>
parents: 199
diff changeset
147 b := tx.Bucket(sessionsBucket)
8426a92fda00 Persistent session store: Implmented Renew.
Sascha L. Teichmann <teichmann@intevation.de>
parents: 199
diff changeset
148 var buf bytes.Buffer
8426a92fda00 Persistent session store: Implmented Renew.
Sascha L. Teichmann <teichmann@intevation.de>
parents: 199
diff changeset
149 if err := con.serialize(&buf); err != nil {
8426a92fda00 Persistent session store: Implmented Renew.
Sascha L. Teichmann <teichmann@intevation.de>
parents: 199
diff changeset
150 return err
8426a92fda00 Persistent session store: Implmented Renew.
Sascha L. Teichmann <teichmann@intevation.de>
parents: 199
diff changeset
151 }
8426a92fda00 Persistent session store: Implmented Renew.
Sascha L. Teichmann <teichmann@intevation.de>
parents: 199
diff changeset
152 return b.Put([]byte(token), buf.Bytes())
8426a92fda00 Persistent session store: Implmented Renew.
Sascha L. Teichmann <teichmann@intevation.de>
parents: 199
diff changeset
153 })
8426a92fda00 Persistent session store: Implmented Renew.
Sascha L. Teichmann <teichmann@intevation.de>
parents: 199
diff changeset
154 if err != nil {
8426a92fda00 Persistent session store: Implmented Renew.
Sascha L. Teichmann <teichmann@intevation.de>
parents: 199
diff changeset
155 log.Printf("error: %v\n", err)
8426a92fda00 Persistent session store: Implmented Renew.
Sascha L. Teichmann <teichmann@intevation.de>
parents: 199
diff changeset
156 }
8426a92fda00 Persistent session store: Implmented Renew.
Sascha L. Teichmann <teichmann@intevation.de>
parents: 199
diff changeset
157 }
8426a92fda00 Persistent session store: Implmented Renew.
Sascha L. Teichmann <teichmann@intevation.de>
parents: 199
diff changeset
158
204
3d0988d9f867 De-virtualize the connection pool implementation.
Sascha L. Teichmann <teichmann@intevation.de>
parents: 203
diff changeset
159 func (pcp *ConnectionPool) Add(token string, session *Session) *Connection {
199
ddc7ef95c247 Implemented Add of persistent sessions.
Sascha L. Teichmann <teichmann@intevation.de>
parents: 197
diff changeset
160 res := make(chan *Connection)
ddc7ef95c247 Implemented Add of persistent sessions.
Sascha L. Teichmann <teichmann@intevation.de>
parents: 197
diff changeset
161
204
3d0988d9f867 De-virtualize the connection pool implementation.
Sascha L. Teichmann <teichmann@intevation.de>
parents: 203
diff changeset
162 pcp.cmds <- func(cp *ConnectionPool) {
199
ddc7ef95c247 Implemented Add of persistent sessions.
Sascha L. Teichmann <teichmann@intevation.de>
parents: 197
diff changeset
163 con := pcp.conns[token]
ddc7ef95c247 Implemented Add of persistent sessions.
Sascha L. Teichmann <teichmann@intevation.de>
parents: 197
diff changeset
164 if con == nil {
ddc7ef95c247 Implemented Add of persistent sessions.
Sascha L. Teichmann <teichmann@intevation.de>
parents: 197
diff changeset
165 con = &Connection{}
ddc7ef95c247 Implemented Add of persistent sessions.
Sascha L. Teichmann <teichmann@intevation.de>
parents: 197
diff changeset
166 pcp.conns[token] = con
ddc7ef95c247 Implemented Add of persistent sessions.
Sascha L. Teichmann <teichmann@intevation.de>
parents: 197
diff changeset
167 }
ddc7ef95c247 Implemented Add of persistent sessions.
Sascha L. Teichmann <teichmann@intevation.de>
parents: 197
diff changeset
168 con.set(session)
200
8426a92fda00 Persistent session store: Implmented Renew.
Sascha L. Teichmann <teichmann@intevation.de>
parents: 199
diff changeset
169 pcp.store(token, con)
199
ddc7ef95c247 Implemented Add of persistent sessions.
Sascha L. Teichmann <teichmann@intevation.de>
parents: 197
diff changeset
170 res <- con
ddc7ef95c247 Implemented Add of persistent sessions.
Sascha L. Teichmann <teichmann@intevation.de>
parents: 197
diff changeset
171 }
ddc7ef95c247 Implemented Add of persistent sessions.
Sascha L. Teichmann <teichmann@intevation.de>
parents: 197
diff changeset
172
ddc7ef95c247 Implemented Add of persistent sessions.
Sascha L. Teichmann <teichmann@intevation.de>
parents: 197
diff changeset
173 con := <-res
ddc7ef95c247 Implemented Add of persistent sessions.
Sascha L. Teichmann <teichmann@intevation.de>
parents: 197
diff changeset
174 return con
190
3457a60fb12d Added stub for a persistent session store.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents:
diff changeset
175 }
3457a60fb12d Added stub for a persistent session store.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents:
diff changeset
176
204
3d0988d9f867 De-virtualize the connection pool implementation.
Sascha L. Teichmann <teichmann@intevation.de>
parents: 203
diff changeset
177 func (pcp *ConnectionPool) Renew(token string) (string, error) {
200
8426a92fda00 Persistent session store: Implmented Renew.
Sascha L. Teichmann <teichmann@intevation.de>
parents: 199
diff changeset
178
8426a92fda00 Persistent session store: Implmented Renew.
Sascha L. Teichmann <teichmann@intevation.de>
parents: 199
diff changeset
179 type result struct {
8426a92fda00 Persistent session store: Implmented Renew.
Sascha L. Teichmann <teichmann@intevation.de>
parents: 199
diff changeset
180 newToken string
8426a92fda00 Persistent session store: Implmented Renew.
Sascha L. Teichmann <teichmann@intevation.de>
parents: 199
diff changeset
181 err error
8426a92fda00 Persistent session store: Implmented Renew.
Sascha L. Teichmann <teichmann@intevation.de>
parents: 199
diff changeset
182 }
8426a92fda00 Persistent session store: Implmented Renew.
Sascha L. Teichmann <teichmann@intevation.de>
parents: 199
diff changeset
183
8426a92fda00 Persistent session store: Implmented Renew.
Sascha L. Teichmann <teichmann@intevation.de>
parents: 199
diff changeset
184 resCh := make(chan result)
8426a92fda00 Persistent session store: Implmented Renew.
Sascha L. Teichmann <teichmann@intevation.de>
parents: 199
diff changeset
185
204
3d0988d9f867 De-virtualize the connection pool implementation.
Sascha L. Teichmann <teichmann@intevation.de>
parents: 203
diff changeset
186 pcp.cmds <- func(cp *ConnectionPool) {
200
8426a92fda00 Persistent session store: Implmented Renew.
Sascha L. Teichmann <teichmann@intevation.de>
parents: 199
diff changeset
187 con := pcp.conns[token]
8426a92fda00 Persistent session store: Implmented Renew.
Sascha L. Teichmann <teichmann@intevation.de>
parents: 199
diff changeset
188 if con == nil {
8426a92fda00 Persistent session store: Implmented Renew.
Sascha L. Teichmann <teichmann@intevation.de>
parents: 199
diff changeset
189 resCh <- result{err: ErrNoSuchToken}
8426a92fda00 Persistent session store: Implmented Renew.
Sascha L. Teichmann <teichmann@intevation.de>
parents: 199
diff changeset
190 } else {
8426a92fda00 Persistent session store: Implmented Renew.
Sascha L. Teichmann <teichmann@intevation.de>
parents: 199
diff changeset
191 delete(pcp.conns, token)
8426a92fda00 Persistent session store: Implmented Renew.
Sascha L. Teichmann <teichmann@intevation.de>
parents: 199
diff changeset
192 pcp.remove(token)
8426a92fda00 Persistent session store: Implmented Renew.
Sascha L. Teichmann <teichmann@intevation.de>
parents: 199
diff changeset
193 newToken := GenerateSessionKey()
8426a92fda00 Persistent session store: Implmented Renew.
Sascha L. Teichmann <teichmann@intevation.de>
parents: 199
diff changeset
194 // TODO: Ensure that this is not racy!
8426a92fda00 Persistent session store: Implmented Renew.
Sascha L. Teichmann <teichmann@intevation.de>
parents: 199
diff changeset
195 con.session.ExpiresAt = time.Now().Add(maxTokenValid).Unix()
8426a92fda00 Persistent session store: Implmented Renew.
Sascha L. Teichmann <teichmann@intevation.de>
parents: 199
diff changeset
196 pcp.conns[newToken] = con
8426a92fda00 Persistent session store: Implmented Renew.
Sascha L. Teichmann <teichmann@intevation.de>
parents: 199
diff changeset
197 pcp.store(newToken, con)
8426a92fda00 Persistent session store: Implmented Renew.
Sascha L. Teichmann <teichmann@intevation.de>
parents: 199
diff changeset
198 resCh <- result{newToken: newToken}
8426a92fda00 Persistent session store: Implmented Renew.
Sascha L. Teichmann <teichmann@intevation.de>
parents: 199
diff changeset
199 }
8426a92fda00 Persistent session store: Implmented Renew.
Sascha L. Teichmann <teichmann@intevation.de>
parents: 199
diff changeset
200 }
8426a92fda00 Persistent session store: Implmented Renew.
Sascha L. Teichmann <teichmann@intevation.de>
parents: 199
diff changeset
201
8426a92fda00 Persistent session store: Implmented Renew.
Sascha L. Teichmann <teichmann@intevation.de>
parents: 199
diff changeset
202 r := <-resCh
8426a92fda00 Persistent session store: Implmented Renew.
Sascha L. Teichmann <teichmann@intevation.de>
parents: 199
diff changeset
203 return r.newToken, r.err
190
3457a60fb12d Added stub for a persistent session store.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents:
diff changeset
204 }
3457a60fb12d Added stub for a persistent session store.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents:
diff changeset
205
204
3d0988d9f867 De-virtualize the connection pool implementation.
Sascha L. Teichmann <teichmann@intevation.de>
parents: 203
diff changeset
206 func (pcp *ConnectionPool) trim(conn *Connection) {
201
80dc7bbe97db Persistent session store: Implemented Do.
Sascha L. Teichmann <teichmann@intevation.de>
parents: 200
diff changeset
207
80dc7bbe97db Persistent session store: Implemented Do.
Sascha L. Teichmann <teichmann@intevation.de>
parents: 200
diff changeset
208 conn.refCount--
80dc7bbe97db Persistent session store: Implemented Do.
Sascha L. Teichmann <teichmann@intevation.de>
parents: 200
diff changeset
209
80dc7bbe97db Persistent session store: Implemented Do.
Sascha L. Teichmann <teichmann@intevation.de>
parents: 200
diff changeset
210 for {
80dc7bbe97db Persistent session store: Implemented Do.
Sascha L. Teichmann <teichmann@intevation.de>
parents: 200
diff changeset
211 least := time.Now()
80dc7bbe97db Persistent session store: Implemented Do.
Sascha L. Teichmann <teichmann@intevation.de>
parents: 200
diff changeset
212 var count int
80dc7bbe97db Persistent session store: Implemented Do.
Sascha L. Teichmann <teichmann@intevation.de>
parents: 200
diff changeset
213 var oldest *Connection
80dc7bbe97db Persistent session store: Implemented Do.
Sascha L. Teichmann <teichmann@intevation.de>
parents: 200
diff changeset
214
80dc7bbe97db Persistent session store: Implemented Do.
Sascha L. Teichmann <teichmann@intevation.de>
parents: 200
diff changeset
215 for _, con := range pcp.conns {
80dc7bbe97db Persistent session store: Implemented Do.
Sascha L. Teichmann <teichmann@intevation.de>
parents: 200
diff changeset
216 if con.db != nil && con.refCount <= 0 {
80dc7bbe97db Persistent session store: Implemented Do.
Sascha L. Teichmann <teichmann@intevation.de>
parents: 200
diff changeset
217 if last := con.last(); last.Before(least) {
80dc7bbe97db Persistent session store: Implemented Do.
Sascha L. Teichmann <teichmann@intevation.de>
parents: 200
diff changeset
218 least = last
80dc7bbe97db Persistent session store: Implemented Do.
Sascha L. Teichmann <teichmann@intevation.de>
parents: 200
diff changeset
219 oldest = con
80dc7bbe97db Persistent session store: Implemented Do.
Sascha L. Teichmann <teichmann@intevation.de>
parents: 200
diff changeset
220 }
80dc7bbe97db Persistent session store: Implemented Do.
Sascha L. Teichmann <teichmann@intevation.de>
parents: 200
diff changeset
221 count++
80dc7bbe97db Persistent session store: Implemented Do.
Sascha L. Teichmann <teichmann@intevation.de>
parents: 200
diff changeset
222 }
80dc7bbe97db Persistent session store: Implemented Do.
Sascha L. Teichmann <teichmann@intevation.de>
parents: 200
diff changeset
223 }
80dc7bbe97db Persistent session store: Implemented Do.
Sascha L. Teichmann <teichmann@intevation.de>
parents: 200
diff changeset
224 if count <= maxOpen {
80dc7bbe97db Persistent session store: Implemented Do.
Sascha L. Teichmann <teichmann@intevation.de>
parents: 200
diff changeset
225 break
80dc7bbe97db Persistent session store: Implemented Do.
Sascha L. Teichmann <teichmann@intevation.de>
parents: 200
diff changeset
226 }
80dc7bbe97db Persistent session store: Implemented Do.
Sascha L. Teichmann <teichmann@intevation.de>
parents: 200
diff changeset
227 oldest.close()
80dc7bbe97db Persistent session store: Implemented Do.
Sascha L. Teichmann <teichmann@intevation.de>
parents: 200
diff changeset
228 }
80dc7bbe97db Persistent session store: Implemented Do.
Sascha L. Teichmann <teichmann@intevation.de>
parents: 200
diff changeset
229 }
80dc7bbe97db Persistent session store: Implemented Do.
Sascha L. Teichmann <teichmann@intevation.de>
parents: 200
diff changeset
230
204
3d0988d9f867 De-virtualize the connection pool implementation.
Sascha L. Teichmann <teichmann@intevation.de>
parents: 203
diff changeset
231 func (pcp *ConnectionPool) Do(token string, fn func(*sql.DB) error) error {
201
80dc7bbe97db Persistent session store: Implemented Do.
Sascha L. Teichmann <teichmann@intevation.de>
parents: 200
diff changeset
232
80dc7bbe97db Persistent session store: Implemented Do.
Sascha L. Teichmann <teichmann@intevation.de>
parents: 200
diff changeset
233 type result struct {
80dc7bbe97db Persistent session store: Implemented Do.
Sascha L. Teichmann <teichmann@intevation.de>
parents: 200
diff changeset
234 con *Connection
80dc7bbe97db Persistent session store: Implemented Do.
Sascha L. Teichmann <teichmann@intevation.de>
parents: 200
diff changeset
235 err error
80dc7bbe97db Persistent session store: Implemented Do.
Sascha L. Teichmann <teichmann@intevation.de>
parents: 200
diff changeset
236 }
80dc7bbe97db Persistent session store: Implemented Do.
Sascha L. Teichmann <teichmann@intevation.de>
parents: 200
diff changeset
237
80dc7bbe97db Persistent session store: Implemented Do.
Sascha L. Teichmann <teichmann@intevation.de>
parents: 200
diff changeset
238 res := make(chan result)
80dc7bbe97db Persistent session store: Implemented Do.
Sascha L. Teichmann <teichmann@intevation.de>
parents: 200
diff changeset
239
204
3d0988d9f867 De-virtualize the connection pool implementation.
Sascha L. Teichmann <teichmann@intevation.de>
parents: 203
diff changeset
240 pcp.cmds <- func(pcp *ConnectionPool) {
201
80dc7bbe97db Persistent session store: Implemented Do.
Sascha L. Teichmann <teichmann@intevation.de>
parents: 200
diff changeset
241 con := pcp.conns[token]
80dc7bbe97db Persistent session store: Implemented Do.
Sascha L. Teichmann <teichmann@intevation.de>
parents: 200
diff changeset
242 if con == nil {
80dc7bbe97db Persistent session store: Implemented Do.
Sascha L. Teichmann <teichmann@intevation.de>
parents: 200
diff changeset
243 res <- result{err: ErrNoSuchToken}
80dc7bbe97db Persistent session store: Implemented Do.
Sascha L. Teichmann <teichmann@intevation.de>
parents: 200
diff changeset
244 return
80dc7bbe97db Persistent session store: Implemented Do.
Sascha L. Teichmann <teichmann@intevation.de>
parents: 200
diff changeset
245 }
80dc7bbe97db Persistent session store: Implemented Do.
Sascha L. Teichmann <teichmann@intevation.de>
parents: 200
diff changeset
246 con.touch()
80dc7bbe97db Persistent session store: Implemented Do.
Sascha L. Teichmann <teichmann@intevation.de>
parents: 200
diff changeset
247 // store the session here. The ref counting for
80dc7bbe97db Persistent session store: Implemented Do.
Sascha L. Teichmann <teichmann@intevation.de>
parents: 200
diff changeset
248 // open db connections is irrelevant for persistence
80dc7bbe97db Persistent session store: Implemented Do.
Sascha L. Teichmann <teichmann@intevation.de>
parents: 200
diff changeset
249 // as they all come up closed when the system reboots.
80dc7bbe97db Persistent session store: Implemented Do.
Sascha L. Teichmann <teichmann@intevation.de>
parents: 200
diff changeset
250 pcp.store(token, con)
80dc7bbe97db Persistent session store: Implemented Do.
Sascha L. Teichmann <teichmann@intevation.de>
parents: 200
diff changeset
251
80dc7bbe97db Persistent session store: Implemented Do.
Sascha L. Teichmann <teichmann@intevation.de>
parents: 200
diff changeset
252 if con.db != nil {
80dc7bbe97db Persistent session store: Implemented Do.
Sascha L. Teichmann <teichmann@intevation.de>
parents: 200
diff changeset
253 con.refCount++
80dc7bbe97db Persistent session store: Implemented Do.
Sascha L. Teichmann <teichmann@intevation.de>
parents: 200
diff changeset
254 res <- result{con: con}
80dc7bbe97db Persistent session store: Implemented Do.
Sascha L. Teichmann <teichmann@intevation.de>
parents: 200
diff changeset
255 return
80dc7bbe97db Persistent session store: Implemented Do.
Sascha L. Teichmann <teichmann@intevation.de>
parents: 200
diff changeset
256 }
80dc7bbe97db Persistent session store: Implemented Do.
Sascha L. Teichmann <teichmann@intevation.de>
parents: 200
diff changeset
257
80dc7bbe97db Persistent session store: Implemented Do.
Sascha L. Teichmann <teichmann@intevation.de>
parents: 200
diff changeset
258 session := con.session
80dc7bbe97db Persistent session store: Implemented Do.
Sascha L. Teichmann <teichmann@intevation.de>
parents: 200
diff changeset
259 db, err := opendb(session.User, session.Password)
80dc7bbe97db Persistent session store: Implemented Do.
Sascha L. Teichmann <teichmann@intevation.de>
parents: 200
diff changeset
260 if err != nil {
80dc7bbe97db Persistent session store: Implemented Do.
Sascha L. Teichmann <teichmann@intevation.de>
parents: 200
diff changeset
261 res <- result{err: err}
80dc7bbe97db Persistent session store: Implemented Do.
Sascha L. Teichmann <teichmann@intevation.de>
parents: 200
diff changeset
262 return
80dc7bbe97db Persistent session store: Implemented Do.
Sascha L. Teichmann <teichmann@intevation.de>
parents: 200
diff changeset
263 }
80dc7bbe97db Persistent session store: Implemented Do.
Sascha L. Teichmann <teichmann@intevation.de>
parents: 200
diff changeset
264 con.db = db
80dc7bbe97db Persistent session store: Implemented Do.
Sascha L. Teichmann <teichmann@intevation.de>
parents: 200
diff changeset
265 con.refCount++
80dc7bbe97db Persistent session store: Implemented Do.
Sascha L. Teichmann <teichmann@intevation.de>
parents: 200
diff changeset
266 res <- result{con: con}
80dc7bbe97db Persistent session store: Implemented Do.
Sascha L. Teichmann <teichmann@intevation.de>
parents: 200
diff changeset
267 }
80dc7bbe97db Persistent session store: Implemented Do.
Sascha L. Teichmann <teichmann@intevation.de>
parents: 200
diff changeset
268
80dc7bbe97db Persistent session store: Implemented Do.
Sascha L. Teichmann <teichmann@intevation.de>
parents: 200
diff changeset
269 r := <-res
80dc7bbe97db Persistent session store: Implemented Do.
Sascha L. Teichmann <teichmann@intevation.de>
parents: 200
diff changeset
270
80dc7bbe97db Persistent session store: Implemented Do.
Sascha L. Teichmann <teichmann@intevation.de>
parents: 200
diff changeset
271 if r.err != nil {
80dc7bbe97db Persistent session store: Implemented Do.
Sascha L. Teichmann <teichmann@intevation.de>
parents: 200
diff changeset
272 return r.err
80dc7bbe97db Persistent session store: Implemented Do.
Sascha L. Teichmann <teichmann@intevation.de>
parents: 200
diff changeset
273 }
80dc7bbe97db Persistent session store: Implemented Do.
Sascha L. Teichmann <teichmann@intevation.de>
parents: 200
diff changeset
274
80dc7bbe97db Persistent session store: Implemented Do.
Sascha L. Teichmann <teichmann@intevation.de>
parents: 200
diff changeset
275 defer func() {
204
3d0988d9f867 De-virtualize the connection pool implementation.
Sascha L. Teichmann <teichmann@intevation.de>
parents: 203
diff changeset
276 pcp.cmds <- func(pcp *ConnectionPool) {
201
80dc7bbe97db Persistent session store: Implemented Do.
Sascha L. Teichmann <teichmann@intevation.de>
parents: 200
diff changeset
277 pcp.trim(r.con)
80dc7bbe97db Persistent session store: Implemented Do.
Sascha L. Teichmann <teichmann@intevation.de>
parents: 200
diff changeset
278 }
80dc7bbe97db Persistent session store: Implemented Do.
Sascha L. Teichmann <teichmann@intevation.de>
parents: 200
diff changeset
279 }()
80dc7bbe97db Persistent session store: Implemented Do.
Sascha L. Teichmann <teichmann@intevation.de>
parents: 200
diff changeset
280
80dc7bbe97db Persistent session store: Implemented Do.
Sascha L. Teichmann <teichmann@intevation.de>
parents: 200
diff changeset
281 return fn(r.con.db)
190
3457a60fb12d Added stub for a persistent session store.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents:
diff changeset
282 }
3457a60fb12d Added stub for a persistent session store.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents:
diff changeset
283
204
3d0988d9f867 De-virtualize the connection pool implementation.
Sascha L. Teichmann <teichmann@intevation.de>
parents: 203
diff changeset
284 func (pcp *ConnectionPool) Session(token string) *Session {
202
dba50c51cda7 Persistent session store: Implemented Session.
Sascha L. Teichmann <teichmann@intevation.de>
parents: 201
diff changeset
285 res := make(chan *Session)
204
3d0988d9f867 De-virtualize the connection pool implementation.
Sascha L. Teichmann <teichmann@intevation.de>
parents: 203
diff changeset
286 pcp.cmds <- func(pcp *ConnectionPool) {
202
dba50c51cda7 Persistent session store: Implemented Session.
Sascha L. Teichmann <teichmann@intevation.de>
parents: 201
diff changeset
287 con := pcp.conns[token]
dba50c51cda7 Persistent session store: Implemented Session.
Sascha L. Teichmann <teichmann@intevation.de>
parents: 201
diff changeset
288 if con == nil {
dba50c51cda7 Persistent session store: Implemented Session.
Sascha L. Teichmann <teichmann@intevation.de>
parents: 201
diff changeset
289 res <- nil
dba50c51cda7 Persistent session store: Implemented Session.
Sascha L. Teichmann <teichmann@intevation.de>
parents: 201
diff changeset
290 } else {
dba50c51cda7 Persistent session store: Implemented Session.
Sascha L. Teichmann <teichmann@intevation.de>
parents: 201
diff changeset
291 con.touch()
dba50c51cda7 Persistent session store: Implemented Session.
Sascha L. Teichmann <teichmann@intevation.de>
parents: 201
diff changeset
292 pcp.store(token, con)
dba50c51cda7 Persistent session store: Implemented Session.
Sascha L. Teichmann <teichmann@intevation.de>
parents: 201
diff changeset
293 res <- con.session
dba50c51cda7 Persistent session store: Implemented Session.
Sascha L. Teichmann <teichmann@intevation.de>
parents: 201
diff changeset
294 }
dba50c51cda7 Persistent session store: Implemented Session.
Sascha L. Teichmann <teichmann@intevation.de>
parents: 201
diff changeset
295 }
dba50c51cda7 Persistent session store: Implemented Session.
Sascha L. Teichmann <teichmann@intevation.de>
parents: 201
diff changeset
296 return <-res
190
3457a60fb12d Added stub for a persistent session store.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents:
diff changeset
297 }
3457a60fb12d Added stub for a persistent session store.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents:
diff changeset
298
204
3d0988d9f867 De-virtualize the connection pool implementation.
Sascha L. Teichmann <teichmann@intevation.de>
parents: 203
diff changeset
299 func (pcp *ConnectionPool) Shutdown() error {
3d0988d9f867 De-virtualize the connection pool implementation.
Sascha L. Teichmann <teichmann@intevation.de>
parents: 203
diff changeset
300 if db := pcp.storage; db != nil {
3d0988d9f867 De-virtualize the connection pool implementation.
Sascha L. Teichmann <teichmann@intevation.de>
parents: 203
diff changeset
301 log.Println("info: shutdown persistent connection pool.")
3d0988d9f867 De-virtualize the connection pool implementation.
Sascha L. Teichmann <teichmann@intevation.de>
parents: 203
diff changeset
302 pcp.storage = nil
193
1585c334e8a7 More on persisting sessions.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 190
diff changeset
303 return db.Close()
1585c334e8a7 More on persisting sessions.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents: 190
diff changeset
304 }
204
3d0988d9f867 De-virtualize the connection pool implementation.
Sascha L. Teichmann <teichmann@intevation.de>
parents: 203
diff changeset
305 log.Println("info: shutdown in-memory connection pool.")
190
3457a60fb12d Added stub for a persistent session store.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents:
diff changeset
306 return nil
3457a60fb12d Added stub for a persistent session store.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents:
diff changeset
307 }