author | Radek Brich <brich.radek@ifortuna.cz> |
Tue, 06 May 2014 18:37:41 +0200 | |
changeset 100 | d6088dba8fea |
parent 89 | 6b72d61837b1 |
child 101 | 2a2d0d5df03b |
permissions | -rw-r--r-- |
0 | 1 |
# -*- coding: utf-8 -*- |
2 |
# |
|
3 |
# PgManager - manage database connections |
|
4 |
# |
|
31
c2e6e24b83d9
Add browser - database schema browser using tuikit (curses UI). Add listdepends - tool which shows depending views for column. Update pgdatadiff - allow composite primary key. Update pgmanager - RowDict is now OrderedDict. Drop support for Python2.x.
Radek Brich <radek.brich@devl.cz>
parents:
26
diff
changeset
|
5 |
# Requires: Python 3.2, psycopg2 |
0 | 6 |
# |
9
2fcc8ef0b97d
Reorganize again :-) Add setup.py.
Radek Brich <radek.brich@devl.cz>
parents:
8
diff
changeset
|
7 |
# Part of pgtoolkit |
2fcc8ef0b97d
Reorganize again :-) Add setup.py.
Radek Brich <radek.brich@devl.cz>
parents:
8
diff
changeset
|
8 |
# http://hg.devl.cz/pgtoolkit |
2fcc8ef0b97d
Reorganize again :-) Add setup.py.
Radek Brich <radek.brich@devl.cz>
parents:
8
diff
changeset
|
9 |
# |
71 | 10 |
# Copyright (c) 2010, 2011, 2012, 2013 Radek Brich <radek.brich@devl.cz> |
0 | 11 |
# |
12 |
# Permission is hereby granted, free of charge, to any person obtaining a copy |
|
13 |
# of this software and associated documentation files (the "Software"), to deal |
|
14 |
# in the Software without restriction, including without limitation the rights |
|
15 |
# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell |
|
16 |
# copies of the Software, and to permit persons to whom the Software is |
|
17 |
# furnished to do so, subject to the following conditions: |
|
18 |
# |
|
19 |
# The above copyright notice and this permission notice shall be included in |
|
20 |
# all copies or substantial portions of the Software. |
|
21 |
# |
|
22 |
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR |
|
23 |
# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, |
|
24 |
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE |
|
25 |
# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER |
|
26 |
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, |
|
27 |
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN |
|
28 |
# THE SOFTWARE. |
|
29 |
||
30 |
"""Postgres database connection manager |
|
31 |
||
71 | 32 |
PgManager wraps psycopg2, adding following features: |
0 | 33 |
|
70 | 34 |
* Save and reuse database connection parameters |
0 | 35 |
|
70 | 36 |
* Connection pooling |
0 | 37 |
|
70 | 38 |
* Easy query using the with statement |
0 | 39 |
|
70 | 40 |
* Dictionary rows |
41 |
||
42 |
Example usage: |
|
0 | 43 |
|
71 | 44 |
from pgtoolkit import pgmanager |
0 | 45 |
|
70 | 46 |
pgm = pgmanager.get_instance() |
47 |
pgm.create_conn(hostaddr='127.0.0.1', dbname='postgres') |
|
0 | 48 |
|
70 | 49 |
with pgm.cursor() as curs: |
50 |
curs.execute('SELECT now() AS now') |
|
51 |
row = curs.fetchone_dict() |
|
52 |
print(row.now) |
|
0 | 53 |
|
54 |
First, we have obtained PgManager instance. This is like calling |
|
55 |
PgManager(), although in our example the instance is global. That means |
|
56 |
getting the instance in another module brings us all the defined connections |
|
57 |
etc. |
|
58 |
||
9
2fcc8ef0b97d
Reorganize again :-) Add setup.py.
Radek Brich <radek.brich@devl.cz>
parents:
8
diff
changeset
|
59 |
On second line we have created connection named 'default' (this name can be left out). |
0 | 60 |
The with statement obtains connection (actually connects to database when needed), |
9
2fcc8ef0b97d
Reorganize again :-) Add setup.py.
Radek Brich <radek.brich@devl.cz>
parents:
8
diff
changeset
|
61 |
then returns cursor for this connection. At the end of with statement, |
2fcc8ef0b97d
Reorganize again :-) Add setup.py.
Radek Brich <radek.brich@devl.cz>
parents:
8
diff
changeset
|
62 |
the connection is returned to the pool or closed (depending on number of connections |
36
e67101c22e83
pgmanager: Add create_conn_listen() which should be used with wait_for_notify. Update wait_for_notify() to not use put_conn(). Add name to ConnectionInfo. Log queries before they are called. Log exceptions. Add notifyexample.
Radek Brich <radek.brich@devl.cz>
parents:
33
diff
changeset
|
63 |
in pool and on setting of pool_size parameter). |
0 | 64 |
|
65 |
The row returned by fetchone_dict() is special dict object, which can be accessed |
|
66 |
using item or attribute access, that is row['now'] or row.now. |
|
70 | 67 |
|
0 | 68 |
""" |
69 |
||
70 |
from contextlib import contextmanager |
|
31
c2e6e24b83d9
Add browser - database schema browser using tuikit (curses UI). Add listdepends - tool which shows depending views for column. Update pgdatadiff - allow composite primary key. Update pgmanager - RowDict is now OrderedDict. Drop support for Python2.x.
Radek Brich <radek.brich@devl.cz>
parents:
26
diff
changeset
|
71 |
from collections import OrderedDict |
0 | 72 |
import logging |
73 |
import threading |
|
24
5664afa530e5
PgManager: Add partial support for multiprocessing.
Radek Brich <radek.brich@devl.cz>
parents:
23
diff
changeset
|
74 |
import multiprocessing |
0 | 75 |
import select |
8
2911935c524d
pgmanager: Add keep_alive support.
Radek Brich <radek.brich@devl.cz>
parents:
7
diff
changeset
|
76 |
import socket |
0 | 77 |
|
78 |
import psycopg2 |
|
79 |
import psycopg2.extensions |
|
80 |
||
19
e526ca146fa9
Add documentation for create_conn(). Fix keep_alive - do not crash if socket settings are not supported.
Radek Brich <radek.brich@devl.cz>
parents:
9
diff
changeset
|
81 |
from psycopg2 import DatabaseError, IntegrityError, OperationalError |
0 | 82 |
|
83 |
||
26
7f219da7ab71
Add logging mechanism for notices from postgres server. Rename SQL log to "pgmanager_sql".
Radek Brich <radek.brich@devl.cz>
parents:
24
diff
changeset
|
84 |
log_sql = logging.getLogger("pgmanager_sql") |
7f219da7ab71
Add logging mechanism for notices from postgres server. Rename SQL log to "pgmanager_sql".
Radek Brich <radek.brich@devl.cz>
parents:
24
diff
changeset
|
85 |
log_notices = logging.getLogger("pgmanager_notices") |
75
39f777341db4
MyManager: Add Cursor.mogrify(). Fix query logging. Update tests.
Radek Brich <radek.brich@devl.cz>
parents:
71
diff
changeset
|
86 |
log_sql.addHandler(logging.NullHandler()) |
39f777341db4
MyManager: Add Cursor.mogrify(). Fix query logging. Update tests.
Radek Brich <radek.brich@devl.cz>
parents:
71
diff
changeset
|
87 |
# NullHandler not needed for notices which are INFO level only |
20
73f0d53fef6b
PgManager: Do not add NullHandler to logger. Rewrite get_instance(). ToolBase: fix prepare_conns() method.
Radek Brich <radek.brich@devl.cz>
parents:
19
diff
changeset
|
88 |
|
73f0d53fef6b
PgManager: Do not add NullHandler to logger. Rewrite get_instance(). ToolBase: fix prepare_conns() method.
Radek Brich <radek.brich@devl.cz>
parents:
19
diff
changeset
|
89 |
|
0 | 90 |
class PgManagerError(Exception): |
91 |
||
92 |
pass |
|
93 |
||
94 |
||
95 |
class ConnectionInfo: |
|
96 |
||
36
e67101c22e83
pgmanager: Add create_conn_listen() which should be used with wait_for_notify. Update wait_for_notify() to not use put_conn(). Add name to ConnectionInfo. Log queries before they are called. Log exceptions. Add notifyexample.
Radek Brich <radek.brich@devl.cz>
parents:
33
diff
changeset
|
97 |
def __init__(self, name, dsn, isolation_level=None, keep_alive=True, |
e67101c22e83
pgmanager: Add create_conn_listen() which should be used with wait_for_notify. Update wait_for_notify() to not use put_conn(). Add name to ConnectionInfo. Log queries before they are called. Log exceptions. Add notifyexample.
Radek Brich <radek.brich@devl.cz>
parents:
33
diff
changeset
|
98 |
init_statement=None, pool_size=1): |
e67101c22e83
pgmanager: Add create_conn_listen() which should be used with wait_for_notify. Update wait_for_notify() to not use put_conn(). Add name to ConnectionInfo. Log queries before they are called. Log exceptions. Add notifyexample.
Radek Brich <radek.brich@devl.cz>
parents:
33
diff
changeset
|
99 |
self.name = name # connection name is logged with SQL queries |
42
9e3775460792
PgManager: update comments.
Radek Brich <radek.brich@devl.cz>
parents:
41
diff
changeset
|
100 |
self.dsn = dsn # dsn or string with connection parameters |
0 | 101 |
self.isolation_level = isolation_level |
19
e526ca146fa9
Add documentation for create_conn(). Fix keep_alive - do not crash if socket settings are not supported.
Radek Brich <radek.brich@devl.cz>
parents:
9
diff
changeset
|
102 |
self.keep_alive = keep_alive |
0 | 103 |
self.init_statement = init_statement |
36
e67101c22e83
pgmanager: Add create_conn_listen() which should be used with wait_for_notify. Update wait_for_notify() to not use put_conn(). Add name to ConnectionInfo. Log queries before they are called. Log exceptions. Add notifyexample.
Radek Brich <radek.brich@devl.cz>
parents:
33
diff
changeset
|
104 |
self.pool_size = pool_size |
0 | 105 |
|
106 |
||
81
f709b1c7ca0c
PgManager: Update RowDict, add write support.
Radek Brich <radek.brich@devl.cz>
parents:
80
diff
changeset
|
107 |
class RowDict(OrderedDict): |
f709b1c7ca0c
PgManager: Update RowDict, add write support.
Radek Brich <radek.brich@devl.cz>
parents:
80
diff
changeset
|
108 |
"""Special dictionary used for rows returned from queries. |
43
a921669e913a
PgManager: rewrite RowDict class.
Radek Brich <radek.brich@devl.cz>
parents:
42
diff
changeset
|
109 |
|
a921669e913a
PgManager: rewrite RowDict class.
Radek Brich <radek.brich@devl.cz>
parents:
42
diff
changeset
|
110 |
Items keep order in which columns where returned from database. |
a921669e913a
PgManager: rewrite RowDict class.
Radek Brich <radek.brich@devl.cz>
parents:
42
diff
changeset
|
111 |
|
81
f709b1c7ca0c
PgManager: Update RowDict, add write support.
Radek Brich <radek.brich@devl.cz>
parents:
80
diff
changeset
|
112 |
It supports three styles of access: |
f709b1c7ca0c
PgManager: Update RowDict, add write support.
Radek Brich <radek.brich@devl.cz>
parents:
80
diff
changeset
|
113 |
|
f709b1c7ca0c
PgManager: Update RowDict, add write support.
Radek Brich <radek.brich@devl.cz>
parents:
80
diff
changeset
|
114 |
Dict style: |
f709b1c7ca0c
PgManager: Update RowDict, add write support.
Radek Brich <radek.brich@devl.cz>
parents:
80
diff
changeset
|
115 |
row['id'] |
f709b1c7ca0c
PgManager: Update RowDict, add write support.
Radek Brich <radek.brich@devl.cz>
parents:
80
diff
changeset
|
116 |
for key in row: |
f709b1c7ca0c
PgManager: Update RowDict, add write support.
Radek Brich <radek.brich@devl.cz>
parents:
80
diff
changeset
|
117 |
... |
f709b1c7ca0c
PgManager: Update RowDict, add write support.
Radek Brich <radek.brich@devl.cz>
parents:
80
diff
changeset
|
118 |
|
f709b1c7ca0c
PgManager: Update RowDict, add write support.
Radek Brich <radek.brich@devl.cz>
parents:
80
diff
changeset
|
119 |
Object style (only works if column name does not collide with any method name): |
f709b1c7ca0c
PgManager: Update RowDict, add write support.
Radek Brich <radek.brich@devl.cz>
parents:
80
diff
changeset
|
120 |
row.id |
f709b1c7ca0c
PgManager: Update RowDict, add write support.
Radek Brich <radek.brich@devl.cz>
parents:
80
diff
changeset
|
121 |
|
f709b1c7ca0c
PgManager: Update RowDict, add write support.
Radek Brich <radek.brich@devl.cz>
parents:
80
diff
changeset
|
122 |
Tuple style: |
f709b1c7ca0c
PgManager: Update RowDict, add write support.
Radek Brich <radek.brich@devl.cz>
parents:
80
diff
changeset
|
123 |
row[0] |
f709b1c7ca0c
PgManager: Update RowDict, add write support.
Radek Brich <radek.brich@devl.cz>
parents:
80
diff
changeset
|
124 |
id, name = row.values() |
43
a921669e913a
PgManager: rewrite RowDict class.
Radek Brich <radek.brich@devl.cz>
parents:
42
diff
changeset
|
125 |
|
a921669e913a
PgManager: rewrite RowDict class.
Radek Brich <radek.brich@devl.cz>
parents:
42
diff
changeset
|
126 |
""" |
a921669e913a
PgManager: rewrite RowDict class.
Radek Brich <radek.brich@devl.cz>
parents:
42
diff
changeset
|
127 |
|
a921669e913a
PgManager: rewrite RowDict class.
Radek Brich <radek.brich@devl.cz>
parents:
42
diff
changeset
|
128 |
def __getitem__(self, key): |
a921669e913a
PgManager: rewrite RowDict class.
Radek Brich <radek.brich@devl.cz>
parents:
42
diff
changeset
|
129 |
if isinstance(key, int): |
81
f709b1c7ca0c
PgManager: Update RowDict, add write support.
Radek Brich <radek.brich@devl.cz>
parents:
80
diff
changeset
|
130 |
return tuple(self.values())[key] |
f709b1c7ca0c
PgManager: Update RowDict, add write support.
Radek Brich <radek.brich@devl.cz>
parents:
80
diff
changeset
|
131 |
else: |
f709b1c7ca0c
PgManager: Update RowDict, add write support.
Radek Brich <radek.brich@devl.cz>
parents:
80
diff
changeset
|
132 |
return OrderedDict.__getitem__(self, key) |
0 | 133 |
|
134 |
def __getattr__(self, key): |
|
31
c2e6e24b83d9
Add browser - database schema browser using tuikit (curses UI). Add listdepends - tool which shows depending views for column. Update pgdatadiff - allow composite primary key. Update pgmanager - RowDict is now OrderedDict. Drop support for Python2.x.
Radek Brich <radek.brich@devl.cz>
parents:
26
diff
changeset
|
135 |
try: |
81
f709b1c7ca0c
PgManager: Update RowDict, add write support.
Radek Brich <radek.brich@devl.cz>
parents:
80
diff
changeset
|
136 |
return self[key] |
31
c2e6e24b83d9
Add browser - database schema browser using tuikit (curses UI). Add listdepends - tool which shows depending views for column. Update pgdatadiff - allow composite primary key. Update pgmanager - RowDict is now OrderedDict. Drop support for Python2.x.
Radek Brich <radek.brich@devl.cz>
parents:
26
diff
changeset
|
137 |
except KeyError: |
c2e6e24b83d9
Add browser - database schema browser using tuikit (curses UI). Add listdepends - tool which shows depending views for column. Update pgdatadiff - allow composite primary key. Update pgmanager - RowDict is now OrderedDict. Drop support for Python2.x.
Radek Brich <radek.brich@devl.cz>
parents:
26
diff
changeset
|
138 |
raise AttributeError(key) |
0 | 139 |
|
140 |
||
141 |
class Cursor(psycopg2.extensions.cursor): |
|
142 |
||
143 |
def execute(self, query, args=None): |
|
48
b82c7c2fb5af
PgManager: Fix logging, log queries before executing, possible exceptions are logged after. Add tests for RowDict. Add tests.py - runs all tests.
Radek Brich <radek.brich@devl.cz>
parents:
46
diff
changeset
|
144 |
# log query before executing |
b82c7c2fb5af
PgManager: Fix logging, log queries before executing, possible exceptions are logged after. Add tests for RowDict. Add tests.py - runs all tests.
Radek Brich <radek.brich@devl.cz>
parents:
46
diff
changeset
|
145 |
self._log_query(query, args) |
0 | 146 |
try: |
147 |
return super(Cursor, self).execute(query, args) |
|
36
e67101c22e83
pgmanager: Add create_conn_listen() which should be used with wait_for_notify. Update wait_for_notify() to not use put_conn(). Add name to ConnectionInfo. Log queries before they are called. Log exceptions. Add notifyexample.
Radek Brich <radek.brich@devl.cz>
parents:
33
diff
changeset
|
148 |
except DatabaseError: |
e67101c22e83
pgmanager: Add create_conn_listen() which should be used with wait_for_notify. Update wait_for_notify() to not use put_conn(). Add name to ConnectionInfo. Log queries before they are called. Log exceptions. Add notifyexample.
Radek Brich <radek.brich@devl.cz>
parents:
33
diff
changeset
|
149 |
self._log_exception() |
46 | 150 |
raise |
0 | 151 |
|
152 |
def callproc(self, procname, args=None): |
|
48
b82c7c2fb5af
PgManager: Fix logging, log queries before executing, possible exceptions are logged after. Add tests for RowDict. Add tests.py - runs all tests.
Radek Brich <radek.brich@devl.cz>
parents:
46
diff
changeset
|
153 |
# log query before executing (not query actually executed but should correspond) |
b82c7c2fb5af
PgManager: Fix logging, log queries before executing, possible exceptions are logged after. Add tests for RowDict. Add tests.py - runs all tests.
Radek Brich <radek.brich@devl.cz>
parents:
46
diff
changeset
|
154 |
self._log_query(self._build_callproc_query(procname, len(args)), args) |
0 | 155 |
try: |
156 |
return super(Cursor, self).callproc(procname, args) |
|
36
e67101c22e83
pgmanager: Add create_conn_listen() which should be used with wait_for_notify. Update wait_for_notify() to not use put_conn(). Add name to ConnectionInfo. Log queries before they are called. Log exceptions. Add notifyexample.
Radek Brich <radek.brich@devl.cz>
parents:
33
diff
changeset
|
157 |
except DatabaseError: |
e67101c22e83
pgmanager: Add create_conn_listen() which should be used with wait_for_notify. Update wait_for_notify() to not use put_conn(). Add name to ConnectionInfo. Log queries before they are called. Log exceptions. Add notifyexample.
Radek Brich <radek.brich@devl.cz>
parents:
33
diff
changeset
|
158 |
self._log_exception() |
46 | 159 |
raise |
0 | 160 |
|
161 |
def row_dict(self, row, lstrip=None): |
|
162 |
adjustname = lambda a: a |
|
163 |
if lstrip: |
|
164 |
adjustname = lambda a: a.lstrip(lstrip) |
|
165 |
return RowDict(zip([adjustname(desc[0]) for desc in self.description], row)) |
|
166 |
||
167 |
def fetchone_dict(self, lstrip=None): |
|
31
c2e6e24b83d9
Add browser - database schema browser using tuikit (curses UI). Add listdepends - tool which shows depending views for column. Update pgdatadiff - allow composite primary key. Update pgmanager - RowDict is now OrderedDict. Drop support for Python2.x.
Radek Brich <radek.brich@devl.cz>
parents:
26
diff
changeset
|
168 |
'''Return one row as OrderedDict''' |
0 | 169 |
row = super(Cursor, self).fetchone() |
7
685b20d2d3ab
Reorganize directories. PgDataDiff - reworked. PgManager - add fetchone_adapted, fetchall_adapted to cursor.
Radek Brich <radek.brich@devl.cz>
parents:
4
diff
changeset
|
170 |
if row is None: |
685b20d2d3ab
Reorganize directories. PgDataDiff - reworked. PgManager - add fetchone_adapted, fetchall_adapted to cursor.
Radek Brich <radek.brich@devl.cz>
parents:
4
diff
changeset
|
171 |
return None |
0 | 172 |
return self.row_dict(row, lstrip) |
173 |
||
174 |
def fetchall_dict(self, lstrip=None): |
|
31
c2e6e24b83d9
Add browser - database schema browser using tuikit (curses UI). Add listdepends - tool which shows depending views for column. Update pgdatadiff - allow composite primary key. Update pgmanager - RowDict is now OrderedDict. Drop support for Python2.x.
Radek Brich <radek.brich@devl.cz>
parents:
26
diff
changeset
|
175 |
'''Return all rows as OrderedDict''' |
0 | 176 |
rows = super(Cursor, self).fetchall() |
177 |
return [self.row_dict(row, lstrip) for row in rows] |
|
178 |
||
41
6aad5e35efe8
PgDataDiff: Fix sorting - do not adapt primary key before sort condition.
Radek Brich <radek.brich@devl.cz>
parents:
37
diff
changeset
|
179 |
def adapt(self, row): |
6aad5e35efe8
PgDataDiff: Fix sorting - do not adapt primary key before sort condition.
Radek Brich <radek.brich@devl.cz>
parents:
37
diff
changeset
|
180 |
if isinstance(row, RowDict): |
6aad5e35efe8
PgDataDiff: Fix sorting - do not adapt primary key before sort condition.
Radek Brich <radek.brich@devl.cz>
parents:
37
diff
changeset
|
181 |
# dict |
54 | 182 |
adapted = dict() |
41
6aad5e35efe8
PgDataDiff: Fix sorting - do not adapt primary key before sort condition.
Radek Brich <radek.brich@devl.cz>
parents:
37
diff
changeset
|
183 |
for key in row.keys(): |
6aad5e35efe8
PgDataDiff: Fix sorting - do not adapt primary key before sort condition.
Radek Brich <radek.brich@devl.cz>
parents:
37
diff
changeset
|
184 |
adapted[key] = self.mogrify('%s', [row[key]]).decode('utf8') |
54 | 185 |
return RowDict(adapted) |
41
6aad5e35efe8
PgDataDiff: Fix sorting - do not adapt primary key before sort condition.
Radek Brich <radek.brich@devl.cz>
parents:
37
diff
changeset
|
186 |
else: |
6aad5e35efe8
PgDataDiff: Fix sorting - do not adapt primary key before sort condition.
Radek Brich <radek.brich@devl.cz>
parents:
37
diff
changeset
|
187 |
# list |
54 | 188 |
return [self.mogrify('%s', [x]).decode('utf8') for x in row] |
41
6aad5e35efe8
PgDataDiff: Fix sorting - do not adapt primary key before sort condition.
Radek Brich <radek.brich@devl.cz>
parents:
37
diff
changeset
|
189 |
|
31
c2e6e24b83d9
Add browser - database schema browser using tuikit (curses UI). Add listdepends - tool which shows depending views for column. Update pgdatadiff - allow composite primary key. Update pgmanager - RowDict is now OrderedDict. Drop support for Python2.x.
Radek Brich <radek.brich@devl.cz>
parents:
26
diff
changeset
|
190 |
def fetchone_adapted(self, lstrip=None): |
c2e6e24b83d9
Add browser - database schema browser using tuikit (curses UI). Add listdepends - tool which shows depending views for column. Update pgdatadiff - allow composite primary key. Update pgmanager - RowDict is now OrderedDict. Drop support for Python2.x.
Radek Brich <radek.brich@devl.cz>
parents:
26
diff
changeset
|
191 |
'''Like fetchone_dict() but values are quoted for direct inclusion in SQL query. |
43
a921669e913a
PgManager: rewrite RowDict class.
Radek Brich <radek.brich@devl.cz>
parents:
42
diff
changeset
|
192 |
|
7
685b20d2d3ab
Reorganize directories. PgDataDiff - reworked. PgManager - add fetchone_adapted, fetchall_adapted to cursor.
Radek Brich <radek.brich@devl.cz>
parents:
4
diff
changeset
|
193 |
This is useful when you need to generate SQL script from data returned |
685b20d2d3ab
Reorganize directories. PgDataDiff - reworked. PgManager - add fetchone_adapted, fetchall_adapted to cursor.
Radek Brich <radek.brich@devl.cz>
parents:
4
diff
changeset
|
194 |
by the query. Use mogrify() for simple cases. |
43
a921669e913a
PgManager: rewrite RowDict class.
Radek Brich <radek.brich@devl.cz>
parents:
42
diff
changeset
|
195 |
|
7
685b20d2d3ab
Reorganize directories. PgDataDiff - reworked. PgManager - add fetchone_adapted, fetchall_adapted to cursor.
Radek Brich <radek.brich@devl.cz>
parents:
4
diff
changeset
|
196 |
''' |
685b20d2d3ab
Reorganize directories. PgDataDiff - reworked. PgManager - add fetchone_adapted, fetchall_adapted to cursor.
Radek Brich <radek.brich@devl.cz>
parents:
4
diff
changeset
|
197 |
row = super(Cursor, self).fetchone() |
685b20d2d3ab
Reorganize directories. PgDataDiff - reworked. PgManager - add fetchone_adapted, fetchall_adapted to cursor.
Radek Brich <radek.brich@devl.cz>
parents:
4
diff
changeset
|
198 |
if row is None: |
685b20d2d3ab
Reorganize directories. PgDataDiff - reworked. PgManager - add fetchone_adapted, fetchall_adapted to cursor.
Radek Brich <radek.brich@devl.cz>
parents:
4
diff
changeset
|
199 |
return None |
31
c2e6e24b83d9
Add browser - database schema browser using tuikit (curses UI). Add listdepends - tool which shows depending views for column. Update pgdatadiff - allow composite primary key. Update pgmanager - RowDict is now OrderedDict. Drop support for Python2.x.
Radek Brich <radek.brich@devl.cz>
parents:
26
diff
changeset
|
200 |
return self.row_dict([self.mogrify('%s', [x]).decode('utf8') for x in row], lstrip) |
7
685b20d2d3ab
Reorganize directories. PgDataDiff - reworked. PgManager - add fetchone_adapted, fetchall_adapted to cursor.
Radek Brich <radek.brich@devl.cz>
parents:
4
diff
changeset
|
201 |
|
31
c2e6e24b83d9
Add browser - database schema browser using tuikit (curses UI). Add listdepends - tool which shows depending views for column. Update pgdatadiff - allow composite primary key. Update pgmanager - RowDict is now OrderedDict. Drop support for Python2.x.
Radek Brich <radek.brich@devl.cz>
parents:
26
diff
changeset
|
202 |
def fetchall_adapted(self, lstrip=None): |
c2e6e24b83d9
Add browser - database schema browser using tuikit (curses UI). Add listdepends - tool which shows depending views for column. Update pgdatadiff - allow composite primary key. Update pgmanager - RowDict is now OrderedDict. Drop support for Python2.x.
Radek Brich <radek.brich@devl.cz>
parents:
26
diff
changeset
|
203 |
'''Like fetchall_dict() but values are quoted for direct inclusion in SQL query.''' |
7
685b20d2d3ab
Reorganize directories. PgDataDiff - reworked. PgManager - add fetchone_adapted, fetchall_adapted to cursor.
Radek Brich <radek.brich@devl.cz>
parents:
4
diff
changeset
|
204 |
rows = super(Cursor, self).fetchall() |
31
c2e6e24b83d9
Add browser - database schema browser using tuikit (curses UI). Add listdepends - tool which shows depending views for column. Update pgdatadiff - allow composite primary key. Update pgmanager - RowDict is now OrderedDict. Drop support for Python2.x.
Radek Brich <radek.brich@devl.cz>
parents:
26
diff
changeset
|
205 |
return [self.row_dict([self.mogrify('%s', [x]).decode('utf8') for x in row], lstrip) for row in rows] |
7
685b20d2d3ab
Reorganize directories. PgDataDiff - reworked. PgManager - add fetchone_adapted, fetchall_adapted to cursor.
Radek Brich <radek.brich@devl.cz>
parents:
4
diff
changeset
|
206 |
|
46 | 207 |
def _log_query(self, query='?', args=None): |
36
e67101c22e83
pgmanager: Add create_conn_listen() which should be used with wait_for_notify. Update wait_for_notify() to not use put_conn(). Add name to ConnectionInfo. Log queries before they are called. Log exceptions. Add notifyexample.
Radek Brich <radek.brich@devl.cz>
parents:
33
diff
changeset
|
208 |
name = self.connection.name if hasattr(self.connection, 'name') else '-' |
89 | 209 |
query = self.mogrify(query, args) |
77
2cfef775f518
PgManager, MyManager: Change log level of SQL queries to debug. Fix MyManager: Wrong query logged when exception occurs.
Radek Brich <radek.brich@devl.cz>
parents:
75
diff
changeset
|
210 |
log_sql.debug('[%s] %s' % (name, query.decode('utf8'))) |
36
e67101c22e83
pgmanager: Add create_conn_listen() which should be used with wait_for_notify. Update wait_for_notify() to not use put_conn(). Add name to ConnectionInfo. Log queries before they are called. Log exceptions. Add notifyexample.
Radek Brich <radek.brich@devl.cz>
parents:
33
diff
changeset
|
211 |
|
e67101c22e83
pgmanager: Add create_conn_listen() which should be used with wait_for_notify. Update wait_for_notify() to not use put_conn(). Add name to ConnectionInfo. Log queries before they are called. Log exceptions. Add notifyexample.
Radek Brich <radek.brich@devl.cz>
parents:
33
diff
changeset
|
212 |
def _log_exception(self): |
e67101c22e83
pgmanager: Add create_conn_listen() which should be used with wait_for_notify. Update wait_for_notify() to not use put_conn(). Add name to ConnectionInfo. Log queries before they are called. Log exceptions. Add notifyexample.
Radek Brich <radek.brich@devl.cz>
parents:
33
diff
changeset
|
213 |
name = self.connection.name if hasattr(self.connection, 'name') else '-' |
e67101c22e83
pgmanager: Add create_conn_listen() which should be used with wait_for_notify. Update wait_for_notify() to not use put_conn(). Add name to ConnectionInfo. Log queries before they are called. Log exceptions. Add notifyexample.
Radek Brich <radek.brich@devl.cz>
parents:
33
diff
changeset
|
214 |
log_sql.exception('[%s] exception:' % (name,)) |
0 | 215 |
|
46 | 216 |
def _build_callproc_query(self, procname, num_args): |
48
b82c7c2fb5af
PgManager: Fix logging, log queries before executing, possible exceptions are logged after. Add tests for RowDict. Add tests.py - runs all tests.
Radek Brich <radek.brich@devl.cz>
parents:
46
diff
changeset
|
217 |
return 'SELECT * FROM %s(%s)' % (procname, ', '.join(['%s'] * num_args)) |
46 | 218 |
|
219 |
||
0 | 220 |
class Connection(psycopg2.extensions.connection): |
221 |
||
222 |
def cursor(self, name=None): |
|
223 |
if name is None: |
|
224 |
return super(Connection, self).cursor(cursor_factory=Cursor) |
|
225 |
else: |
|
226 |
return super(Connection, self).cursor(name, cursor_factory=Cursor) |
|
227 |
||
8
2911935c524d
pgmanager: Add keep_alive support.
Radek Brich <radek.brich@devl.cz>
parents:
7
diff
changeset
|
228 |
def keep_alive(self): |
2911935c524d
pgmanager: Add keep_alive support.
Radek Brich <radek.brich@devl.cz>
parents:
7
diff
changeset
|
229 |
'''Set socket to keepalive mode. Must be called before any query.''' |
37 | 230 |
sock = socket.fromfd(self.fileno(), socket.AF_INET, socket.SOCK_STREAM) |
8
2911935c524d
pgmanager: Add keep_alive support.
Radek Brich <radek.brich@devl.cz>
parents:
7
diff
changeset
|
231 |
sock.setsockopt(socket.SOL_SOCKET, socket.SO_KEEPALIVE, 1) |
19
e526ca146fa9
Add documentation for create_conn(). Fix keep_alive - do not crash if socket settings are not supported.
Radek Brich <radek.brich@devl.cz>
parents:
9
diff
changeset
|
232 |
try: |
e526ca146fa9
Add documentation for create_conn(). Fix keep_alive - do not crash if socket settings are not supported.
Radek Brich <radek.brich@devl.cz>
parents:
9
diff
changeset
|
233 |
# Maximum keep-alive probes before asuming the connection is lost |
e526ca146fa9
Add documentation for create_conn(). Fix keep_alive - do not crash if socket settings are not supported.
Radek Brich <radek.brich@devl.cz>
parents:
9
diff
changeset
|
234 |
sock.setsockopt(socket.IPPROTO_TCP, socket.TCP_KEEPCNT, 5) |
e526ca146fa9
Add documentation for create_conn(). Fix keep_alive - do not crash if socket settings are not supported.
Radek Brich <radek.brich@devl.cz>
parents:
9
diff
changeset
|
235 |
# Interval (in seconds) between keep-alive probes |
e526ca146fa9
Add documentation for create_conn(). Fix keep_alive - do not crash if socket settings are not supported.
Radek Brich <radek.brich@devl.cz>
parents:
9
diff
changeset
|
236 |
sock.setsockopt(socket.IPPROTO_TCP, socket.TCP_KEEPINTVL, 2) |
e526ca146fa9
Add documentation for create_conn(). Fix keep_alive - do not crash if socket settings are not supported.
Radek Brich <radek.brich@devl.cz>
parents:
9
diff
changeset
|
237 |
# Maximum idle time (in seconds) before start sending keep-alive probes |
e526ca146fa9
Add documentation for create_conn(). Fix keep_alive - do not crash if socket settings are not supported.
Radek Brich <radek.brich@devl.cz>
parents:
9
diff
changeset
|
238 |
sock.setsockopt(socket.IPPROTO_TCP, socket.TCP_KEEPIDLE, 10) |
e526ca146fa9
Add documentation for create_conn(). Fix keep_alive - do not crash if socket settings are not supported.
Radek Brich <radek.brich@devl.cz>
parents:
9
diff
changeset
|
239 |
except socket.error: |
e526ca146fa9
Add documentation for create_conn(). Fix keep_alive - do not crash if socket settings are not supported.
Radek Brich <radek.brich@devl.cz>
parents:
9
diff
changeset
|
240 |
pass |
37 | 241 |
# close duplicated fd, options set for socket stays |
242 |
sock.close() |
|
8
2911935c524d
pgmanager: Add keep_alive support.
Radek Brich <radek.brich@devl.cz>
parents:
7
diff
changeset
|
243 |
|
0 | 244 |
|
245 |
class PgManager: |
|
246 |
||
247 |
def __init__(self): |
|
248 |
self.conn_known = {} # available connections |
|
24
5664afa530e5
PgManager: Add partial support for multiprocessing.
Radek Brich <radek.brich@devl.cz>
parents:
23
diff
changeset
|
249 |
self.conn_pool = {} # active connetions |
5664afa530e5
PgManager: Add partial support for multiprocessing.
Radek Brich <radek.brich@devl.cz>
parents:
23
diff
changeset
|
250 |
self.lock = threading.Lock() # mutual exclusion for threads |
5664afa530e5
PgManager: Add partial support for multiprocessing.
Radek Brich <radek.brich@devl.cz>
parents:
23
diff
changeset
|
251 |
self.pid = multiprocessing.current_process().pid # forking check |
0 | 252 |
|
253 |
def __del__(self): |
|
254 |
for conn in tuple(self.conn_known.keys()): |
|
255 |
self.destroy_conn(conn) |
|
256 |
||
36
e67101c22e83
pgmanager: Add create_conn_listen() which should be used with wait_for_notify. Update wait_for_notify() to not use put_conn(). Add name to ConnectionInfo. Log queries before they are called. Log exceptions. Add notifyexample.
Radek Brich <radek.brich@devl.cz>
parents:
33
diff
changeset
|
257 |
def create_conn(self, name='default', isolation_level=None, keep_alive=True, init_statement=None, |
e67101c22e83
pgmanager: Add create_conn_listen() which should be used with wait_for_notify. Update wait_for_notify() to not use put_conn(). Add name to ConnectionInfo. Log queries before they are called. Log exceptions. Add notifyexample.
Radek Brich <radek.brich@devl.cz>
parents:
33
diff
changeset
|
258 |
pool_size=1, dsn=None, **kwargs): |
19
e526ca146fa9
Add documentation for create_conn(). Fix keep_alive - do not crash if socket settings are not supported.
Radek Brich <radek.brich@devl.cz>
parents:
9
diff
changeset
|
259 |
'''Create named connection. |
43
a921669e913a
PgManager: rewrite RowDict class.
Radek Brich <radek.brich@devl.cz>
parents:
42
diff
changeset
|
260 |
|
70 | 261 |
*name* -- name for connection |
262 |
||
263 |
*pool_size* -- how many connections will be kept open in pool. |
|
264 |
More connections will still be created but they will be closed by put_conn. |
|
265 |
`None` will disable pool, get_conn() will then always return same connection. |
|
266 |
||
267 |
*isolation_level* -- `"autocommit"`, `"read_committed"`, `"serializable"` or `None` for driver default |
|
268 |
||
269 |
*keep_alive* -- set socket to keepalive mode |
|
270 |
||
271 |
*dsn* -- connection string (parameters or data source name) |
|
43
a921669e913a
PgManager: rewrite RowDict class.
Radek Brich <radek.brich@devl.cz>
parents:
42
diff
changeset
|
272 |
|
42
9e3775460792
PgManager: update comments.
Radek Brich <radek.brich@devl.cz>
parents:
41
diff
changeset
|
273 |
Other keyword args are used as connection parameters. |
43
a921669e913a
PgManager: rewrite RowDict class.
Radek Brich <radek.brich@devl.cz>
parents:
42
diff
changeset
|
274 |
|
19
e526ca146fa9
Add documentation for create_conn(). Fix keep_alive - do not crash if socket settings are not supported.
Radek Brich <radek.brich@devl.cz>
parents:
9
diff
changeset
|
275 |
''' |
0 | 276 |
if name in self.conn_known: |
2 | 277 |
raise PgManagerError('Connection name "%s" already registered.' % name) |
0 | 278 |
|
279 |
if dsn is None: |
|
36
e67101c22e83
pgmanager: Add create_conn_listen() which should be used with wait_for_notify. Update wait_for_notify() to not use put_conn(). Add name to ConnectionInfo. Log queries before they are called. Log exceptions. Add notifyexample.
Radek Brich <radek.brich@devl.cz>
parents:
33
diff
changeset
|
280 |
dsn = ' '.join([x[0]+'='+str(x[1]) for x in kwargs.items() if x[1] is not None]) |
0 | 281 |
|
282 |
isolation_level = self._normalize_isolation_level(isolation_level) |
|
36
e67101c22e83
pgmanager: Add create_conn_listen() which should be used with wait_for_notify. Update wait_for_notify() to not use put_conn(). Add name to ConnectionInfo. Log queries before they are called. Log exceptions. Add notifyexample.
Radek Brich <radek.brich@devl.cz>
parents:
33
diff
changeset
|
283 |
ci = ConnectionInfo(name, dsn, isolation_level, keep_alive, init_statement, pool_size) |
0 | 284 |
|
285 |
self.conn_known[name] = ci |
|
286 |
self.conn_pool[name] = [] |
|
43
a921669e913a
PgManager: rewrite RowDict class.
Radek Brich <radek.brich@devl.cz>
parents:
42
diff
changeset
|
287 |
|
36
e67101c22e83
pgmanager: Add create_conn_listen() which should be used with wait_for_notify. Update wait_for_notify() to not use put_conn(). Add name to ConnectionInfo. Log queries before they are called. Log exceptions. Add notifyexample.
Radek Brich <radek.brich@devl.cz>
parents:
33
diff
changeset
|
288 |
def create_conn_listen(self, name, channel, dsn=None, copy_dsn=None, **kwargs): |
e67101c22e83
pgmanager: Add create_conn_listen() which should be used with wait_for_notify. Update wait_for_notify() to not use put_conn(). Add name to ConnectionInfo. Log queries before they are called. Log exceptions. Add notifyexample.
Radek Brich <radek.brich@devl.cz>
parents:
33
diff
changeset
|
289 |
'''Create connection listening for notifies. |
43
a921669e913a
PgManager: rewrite RowDict class.
Radek Brich <radek.brich@devl.cz>
parents:
42
diff
changeset
|
290 |
|
36
e67101c22e83
pgmanager: Add create_conn_listen() which should be used with wait_for_notify. Update wait_for_notify() to not use put_conn(). Add name to ConnectionInfo. Log queries before they are called. Log exceptions. Add notifyexample.
Radek Brich <radek.brich@devl.cz>
parents:
33
diff
changeset
|
291 |
Disables pool. If you want to use pool, create other connection for that. |
e67101c22e83
pgmanager: Add create_conn_listen() which should be used with wait_for_notify. Update wait_for_notify() to not use put_conn(). Add name to ConnectionInfo. Log queries before they are called. Log exceptions. Add notifyexample.
Radek Brich <radek.brich@devl.cz>
parents:
33
diff
changeset
|
292 |
This connection can be used as usual: conn.cursor() etc. |
43
a921669e913a
PgManager: rewrite RowDict class.
Radek Brich <radek.brich@devl.cz>
parents:
42
diff
changeset
|
293 |
Don't use PgManager's cursor() and put_conn(). |
a921669e913a
PgManager: rewrite RowDict class.
Radek Brich <radek.brich@devl.cz>
parents:
42
diff
changeset
|
294 |
|
70 | 295 |
*name* -- name for connection |
296 |
||
297 |
*channel* -- listen on this channel |
|
298 |
||
299 |
*copy_dsn* -- specify name of other connection and its dsn will be used |
|
43
a921669e913a
PgManager: rewrite RowDict class.
Radek Brich <radek.brich@devl.cz>
parents:
42
diff
changeset
|
300 |
|
36
e67101c22e83
pgmanager: Add create_conn_listen() which should be used with wait_for_notify. Update wait_for_notify() to not use put_conn(). Add name to ConnectionInfo. Log queries before they are called. Log exceptions. Add notifyexample.
Radek Brich <radek.brich@devl.cz>
parents:
33
diff
changeset
|
301 |
Other parameters forwarded to create_conn(). |
43
a921669e913a
PgManager: rewrite RowDict class.
Radek Brich <radek.brich@devl.cz>
parents:
42
diff
changeset
|
302 |
|
36
e67101c22e83
pgmanager: Add create_conn_listen() which should be used with wait_for_notify. Update wait_for_notify() to not use put_conn(). Add name to ConnectionInfo. Log queries before they are called. Log exceptions. Add notifyexample.
Radek Brich <radek.brich@devl.cz>
parents:
33
diff
changeset
|
303 |
''' |
e67101c22e83
pgmanager: Add create_conn_listen() which should be used with wait_for_notify. Update wait_for_notify() to not use put_conn(). Add name to ConnectionInfo. Log queries before they are called. Log exceptions. Add notifyexample.
Radek Brich <radek.brich@devl.cz>
parents:
33
diff
changeset
|
304 |
if dsn is None and copy_dsn: |
e67101c22e83
pgmanager: Add create_conn_listen() which should be used with wait_for_notify. Update wait_for_notify() to not use put_conn(). Add name to ConnectionInfo. Log queries before they are called. Log exceptions. Add notifyexample.
Radek Brich <radek.brich@devl.cz>
parents:
33
diff
changeset
|
305 |
try: |
e67101c22e83
pgmanager: Add create_conn_listen() which should be used with wait_for_notify. Update wait_for_notify() to not use put_conn(). Add name to ConnectionInfo. Log queries before they are called. Log exceptions. Add notifyexample.
Radek Brich <radek.brich@devl.cz>
parents:
33
diff
changeset
|
306 |
dsn = self.conn_known[copy_dsn].dsn |
e67101c22e83
pgmanager: Add create_conn_listen() which should be used with wait_for_notify. Update wait_for_notify() to not use put_conn(). Add name to ConnectionInfo. Log queries before they are called. Log exceptions. Add notifyexample.
Radek Brich <radek.brich@devl.cz>
parents:
33
diff
changeset
|
307 |
except KeyError: |
e67101c22e83
pgmanager: Add create_conn_listen() which should be used with wait_for_notify. Update wait_for_notify() to not use put_conn(). Add name to ConnectionInfo. Log queries before they are called. Log exceptions. Add notifyexample.
Radek Brich <radek.brich@devl.cz>
parents:
33
diff
changeset
|
308 |
raise PgManagerError("Connection name '%s' not registered." % copy_dsn) |
e67101c22e83
pgmanager: Add create_conn_listen() which should be used with wait_for_notify. Update wait_for_notify() to not use put_conn(). Add name to ConnectionInfo. Log queries before they are called. Log exceptions. Add notifyexample.
Radek Brich <radek.brich@devl.cz>
parents:
33
diff
changeset
|
309 |
listen_query = "LISTEN " + channel |
e67101c22e83
pgmanager: Add create_conn_listen() which should be used with wait_for_notify. Update wait_for_notify() to not use put_conn(). Add name to ConnectionInfo. Log queries before they are called. Log exceptions. Add notifyexample.
Radek Brich <radek.brich@devl.cz>
parents:
33
diff
changeset
|
310 |
self.create_conn(name=name, pool_size=None, isolation_level='autocommit', init_statement=listen_query, |
e67101c22e83
pgmanager: Add create_conn_listen() which should be used with wait_for_notify. Update wait_for_notify() to not use put_conn(). Add name to ConnectionInfo. Log queries before they are called. Log exceptions. Add notifyexample.
Radek Brich <radek.brich@devl.cz>
parents:
33
diff
changeset
|
311 |
dsn=dsn, **kwargs) |
0 | 312 |
|
313 |
def close_conn(self, name='default'): |
|
314 |
'''Close all connections of given name. |
|
43
a921669e913a
PgManager: rewrite RowDict class.
Radek Brich <radek.brich@devl.cz>
parents:
42
diff
changeset
|
315 |
|
0 | 316 |
Connection credentials are still saved. |
43
a921669e913a
PgManager: rewrite RowDict class.
Radek Brich <radek.brich@devl.cz>
parents:
42
diff
changeset
|
317 |
|
0 | 318 |
''' |
319 |
while len(self.conn_pool[name]): |
|
320 |
conn = self.conn_pool[name].pop() |
|
321 |
conn.close() |
|
322 |
||
323 |
def destroy_conn(self, name='default'): |
|
324 |
'''Destroy connection. |
|
43
a921669e913a
PgManager: rewrite RowDict class.
Radek Brich <radek.brich@devl.cz>
parents:
42
diff
changeset
|
325 |
|
0 | 326 |
Counterpart of create_conn. |
43
a921669e913a
PgManager: rewrite RowDict class.
Radek Brich <radek.brich@devl.cz>
parents:
42
diff
changeset
|
327 |
|
0 | 328 |
''' |
329 |
if not name in self.conn_known: |
|
2 | 330 |
raise PgManagerError('Connection name "%s" not registered.' % name) |
0 | 331 |
|
332 |
self.close_conn(name) |
|
333 |
||
334 |
del self.conn_known[name] |
|
335 |
del self.conn_pool[name] |
|
336 |
||
337 |
def get_conn(self, name='default'): |
|
338 |
'''Get connection of name 'name' from pool.''' |
|
24
5664afa530e5
PgManager: Add partial support for multiprocessing.
Radek Brich <radek.brich@devl.cz>
parents:
23
diff
changeset
|
339 |
self._check_fork() |
0 | 340 |
self.lock.acquire() |
341 |
try: |
|
36
e67101c22e83
pgmanager: Add create_conn_listen() which should be used with wait_for_notify. Update wait_for_notify() to not use put_conn(). Add name to ConnectionInfo. Log queries before they are called. Log exceptions. Add notifyexample.
Radek Brich <radek.brich@devl.cz>
parents:
33
diff
changeset
|
342 |
try: |
e67101c22e83
pgmanager: Add create_conn_listen() which should be used with wait_for_notify. Update wait_for_notify() to not use put_conn(). Add name to ConnectionInfo. Log queries before they are called. Log exceptions. Add notifyexample.
Radek Brich <radek.brich@devl.cz>
parents:
33
diff
changeset
|
343 |
ci = self.conn_known[name] |
e67101c22e83
pgmanager: Add create_conn_listen() which should be used with wait_for_notify. Update wait_for_notify() to not use put_conn(). Add name to ConnectionInfo. Log queries before they are called. Log exceptions. Add notifyexample.
Radek Brich <radek.brich@devl.cz>
parents:
33
diff
changeset
|
344 |
except KeyError: |
2 | 345 |
raise PgManagerError("Connection name '%s' not registered." % name) |
43
a921669e913a
PgManager: rewrite RowDict class.
Radek Brich <radek.brich@devl.cz>
parents:
42
diff
changeset
|
346 |
|
36
e67101c22e83
pgmanager: Add create_conn_listen() which should be used with wait_for_notify. Update wait_for_notify() to not use put_conn(). Add name to ConnectionInfo. Log queries before they are called. Log exceptions. Add notifyexample.
Radek Brich <radek.brich@devl.cz>
parents:
33
diff
changeset
|
347 |
# no pool, just one static connection |
e67101c22e83
pgmanager: Add create_conn_listen() which should be used with wait_for_notify. Update wait_for_notify() to not use put_conn(). Add name to ConnectionInfo. Log queries before they are called. Log exceptions. Add notifyexample.
Radek Brich <radek.brich@devl.cz>
parents:
33
diff
changeset
|
348 |
if ci.pool_size is None: |
e67101c22e83
pgmanager: Add create_conn_listen() which should be used with wait_for_notify. Update wait_for_notify() to not use put_conn(). Add name to ConnectionInfo. Log queries before they are called. Log exceptions. Add notifyexample.
Radek Brich <radek.brich@devl.cz>
parents:
33
diff
changeset
|
349 |
# check for existing connection |
e67101c22e83
pgmanager: Add create_conn_listen() which should be used with wait_for_notify. Update wait_for_notify() to not use put_conn(). Add name to ConnectionInfo. Log queries before they are called. Log exceptions. Add notifyexample.
Radek Brich <radek.brich@devl.cz>
parents:
33
diff
changeset
|
350 |
try: |
e67101c22e83
pgmanager: Add create_conn_listen() which should be used with wait_for_notify. Update wait_for_notify() to not use put_conn(). Add name to ConnectionInfo. Log queries before they are called. Log exceptions. Add notifyexample.
Radek Brich <radek.brich@devl.cz>
parents:
33
diff
changeset
|
351 |
conn = self.conn_pool[name][0] |
e67101c22e83
pgmanager: Add create_conn_listen() which should be used with wait_for_notify. Update wait_for_notify() to not use put_conn(). Add name to ConnectionInfo. Log queries before they are called. Log exceptions. Add notifyexample.
Radek Brich <radek.brich@devl.cz>
parents:
33
diff
changeset
|
352 |
if conn.closed: |
e67101c22e83
pgmanager: Add create_conn_listen() which should be used with wait_for_notify. Update wait_for_notify() to not use put_conn(). Add name to ConnectionInfo. Log queries before they are called. Log exceptions. Add notifyexample.
Radek Brich <radek.brich@devl.cz>
parents:
33
diff
changeset
|
353 |
conn = None |
e67101c22e83
pgmanager: Add create_conn_listen() which should be used with wait_for_notify. Update wait_for_notify() to not use put_conn(). Add name to ConnectionInfo. Log queries before they are called. Log exceptions. Add notifyexample.
Radek Brich <radek.brich@devl.cz>
parents:
33
diff
changeset
|
354 |
except IndexError: |
0 | 355 |
conn = None |
36
e67101c22e83
pgmanager: Add create_conn_listen() which should be used with wait_for_notify. Update wait_for_notify() to not use put_conn(). Add name to ConnectionInfo. Log queries before they are called. Log exceptions. Add notifyexample.
Radek Brich <radek.brich@devl.cz>
parents:
33
diff
changeset
|
356 |
self.conn_pool[name].append(conn) |
e67101c22e83
pgmanager: Add create_conn_listen() which should be used with wait_for_notify. Update wait_for_notify() to not use put_conn(). Add name to ConnectionInfo. Log queries before they are called. Log exceptions. Add notifyexample.
Radek Brich <radek.brich@devl.cz>
parents:
33
diff
changeset
|
357 |
# if no existing connection is valid, connect new one and save it |
e67101c22e83
pgmanager: Add create_conn_listen() which should be used with wait_for_notify. Update wait_for_notify() to not use put_conn(). Add name to ConnectionInfo. Log queries before they are called. Log exceptions. Add notifyexample.
Radek Brich <radek.brich@devl.cz>
parents:
33
diff
changeset
|
358 |
if conn is None: |
e67101c22e83
pgmanager: Add create_conn_listen() which should be used with wait_for_notify. Update wait_for_notify() to not use put_conn(). Add name to ConnectionInfo. Log queries before they are called. Log exceptions. Add notifyexample.
Radek Brich <radek.brich@devl.cz>
parents:
33
diff
changeset
|
359 |
conn = self._connect(ci) |
e67101c22e83
pgmanager: Add create_conn_listen() which should be used with wait_for_notify. Update wait_for_notify() to not use put_conn(). Add name to ConnectionInfo. Log queries before they are called. Log exceptions. Add notifyexample.
Radek Brich <radek.brich@devl.cz>
parents:
33
diff
changeset
|
360 |
self.conn_pool[name][0] = conn |
43
a921669e913a
PgManager: rewrite RowDict class.
Radek Brich <radek.brich@devl.cz>
parents:
42
diff
changeset
|
361 |
|
36
e67101c22e83
pgmanager: Add create_conn_listen() which should be used with wait_for_notify. Update wait_for_notify() to not use put_conn(). Add name to ConnectionInfo. Log queries before they are called. Log exceptions. Add notifyexample.
Radek Brich <radek.brich@devl.cz>
parents:
33
diff
changeset
|
362 |
# connection from pool |
e67101c22e83
pgmanager: Add create_conn_listen() which should be used with wait_for_notify. Update wait_for_notify() to not use put_conn(). Add name to ConnectionInfo. Log queries before they are called. Log exceptions. Add notifyexample.
Radek Brich <radek.brich@devl.cz>
parents:
33
diff
changeset
|
363 |
else: |
e67101c22e83
pgmanager: Add create_conn_listen() which should be used with wait_for_notify. Update wait_for_notify() to not use put_conn(). Add name to ConnectionInfo. Log queries before they are called. Log exceptions. Add notifyexample.
Radek Brich <radek.brich@devl.cz>
parents:
33
diff
changeset
|
364 |
conn = None |
e67101c22e83
pgmanager: Add create_conn_listen() which should be used with wait_for_notify. Update wait_for_notify() to not use put_conn(). Add name to ConnectionInfo. Log queries before they are called. Log exceptions. Add notifyexample.
Radek Brich <radek.brich@devl.cz>
parents:
33
diff
changeset
|
365 |
while len(self.conn_pool[name]) and conn is None: |
e67101c22e83
pgmanager: Add create_conn_listen() which should be used with wait_for_notify. Update wait_for_notify() to not use put_conn(). Add name to ConnectionInfo. Log queries before they are called. Log exceptions. Add notifyexample.
Radek Brich <radek.brich@devl.cz>
parents:
33
diff
changeset
|
366 |
conn = self.conn_pool[name].pop() |
e67101c22e83
pgmanager: Add create_conn_listen() which should be used with wait_for_notify. Update wait_for_notify() to not use put_conn(). Add name to ConnectionInfo. Log queries before they are called. Log exceptions. Add notifyexample.
Radek Brich <radek.brich@devl.cz>
parents:
33
diff
changeset
|
367 |
if conn.closed: |
e67101c22e83
pgmanager: Add create_conn_listen() which should be used with wait_for_notify. Update wait_for_notify() to not use put_conn(). Add name to ConnectionInfo. Log queries before they are called. Log exceptions. Add notifyexample.
Radek Brich <radek.brich@devl.cz>
parents:
33
diff
changeset
|
368 |
conn = None |
43
a921669e913a
PgManager: rewrite RowDict class.
Radek Brich <radek.brich@devl.cz>
parents:
42
diff
changeset
|
369 |
|
36
e67101c22e83
pgmanager: Add create_conn_listen() which should be used with wait_for_notify. Update wait_for_notify() to not use put_conn(). Add name to ConnectionInfo. Log queries before they are called. Log exceptions. Add notifyexample.
Radek Brich <radek.brich@devl.cz>
parents:
33
diff
changeset
|
370 |
if conn is None: |
e67101c22e83
pgmanager: Add create_conn_listen() which should be used with wait_for_notify. Update wait_for_notify() to not use put_conn(). Add name to ConnectionInfo. Log queries before they are called. Log exceptions. Add notifyexample.
Radek Brich <radek.brich@devl.cz>
parents:
33
diff
changeset
|
371 |
conn = self._connect(ci) |
0 | 372 |
finally: |
373 |
self.lock.release() |
|
374 |
return conn |
|
375 |
||
376 |
def put_conn(self, conn, name='default'): |
|
377 |
'''Put connection back to pool. |
|
43
a921669e913a
PgManager: rewrite RowDict class.
Radek Brich <radek.brich@devl.cz>
parents:
42
diff
changeset
|
378 |
|
70 | 379 |
*name* must be same as used for get_conn, otherwise things become broken. |
43
a921669e913a
PgManager: rewrite RowDict class.
Radek Brich <radek.brich@devl.cz>
parents:
42
diff
changeset
|
380 |
|
0 | 381 |
''' |
382 |
self.lock.acquire() |
|
383 |
try: |
|
384 |
if not name in self.conn_known: |
|
2 | 385 |
raise PgManagerError("Connection name '%s' not registered." % name) |
0 | 386 |
|
36
e67101c22e83
pgmanager: Add create_conn_listen() which should be used with wait_for_notify. Update wait_for_notify() to not use put_conn(). Add name to ConnectionInfo. Log queries before they are called. Log exceptions. Add notifyexample.
Radek Brich <radek.brich@devl.cz>
parents:
33
diff
changeset
|
387 |
if len(self.conn_pool[name]) >= self.conn_known[name].pool_size: |
0 | 388 |
conn.close() |
389 |
return |
|
390 |
||
391 |
if conn.get_transaction_status() == psycopg2.extensions.TRANSACTION_STATUS_UNKNOWN: |
|
392 |
conn.close() |
|
393 |
return |
|
394 |
||
395 |
# connection returned to the pool must not be in transaction |
|
396 |
if conn.get_transaction_status() != psycopg2.extensions.TRANSACTION_STATUS_IDLE: |
|
33
bd0beda49bcb
PgManager: log connection name with queries. BatchUpdateTool: handle some possible exceptions and try reconnect to database.
Radek Brich <radek.brich@devl.cz>
parents:
31
diff
changeset
|
397 |
try: |
bd0beda49bcb
PgManager: log connection name with queries. BatchUpdateTool: handle some possible exceptions and try reconnect to database.
Radek Brich <radek.brich@devl.cz>
parents:
31
diff
changeset
|
398 |
conn.rollback() |
bd0beda49bcb
PgManager: log connection name with queries. BatchUpdateTool: handle some possible exceptions and try reconnect to database.
Radek Brich <radek.brich@devl.cz>
parents:
31
diff
changeset
|
399 |
except OperationalError: |
bd0beda49bcb
PgManager: log connection name with queries. BatchUpdateTool: handle some possible exceptions and try reconnect to database.
Radek Brich <radek.brich@devl.cz>
parents:
31
diff
changeset
|
400 |
if not conn.closed: |
bd0beda49bcb
PgManager: log connection name with queries. BatchUpdateTool: handle some possible exceptions and try reconnect to database.
Radek Brich <radek.brich@devl.cz>
parents:
31
diff
changeset
|
401 |
conn.close() |
bd0beda49bcb
PgManager: log connection name with queries. BatchUpdateTool: handle some possible exceptions and try reconnect to database.
Radek Brich <radek.brich@devl.cz>
parents:
31
diff
changeset
|
402 |
return |
0 | 403 |
|
404 |
self.conn_pool[name].append(conn) |
|
405 |
finally: |
|
406 |
self.lock.release() |
|
407 |
||
408 |
@contextmanager |
|
409 |
def cursor(self, name='default'): |
|
410 |
'''Cursor context. |
|
43
a921669e913a
PgManager: rewrite RowDict class.
Radek Brich <radek.brich@devl.cz>
parents:
42
diff
changeset
|
411 |
|
70 | 412 |
Uses any connection info with *name* from pool |
0 | 413 |
and returns cursor for that connection. |
43
a921669e913a
PgManager: rewrite RowDict class.
Radek Brich <radek.brich@devl.cz>
parents:
42
diff
changeset
|
414 |
|
0 | 415 |
''' |
416 |
conn = self.get_conn(name) |
|
417 |
||
418 |
try: |
|
419 |
curs = conn.cursor() |
|
420 |
yield curs |
|
421 |
finally: |
|
422 |
curs.close() |
|
26
7f219da7ab71
Add logging mechanism for notices from postgres server. Rename SQL log to "pgmanager_sql".
Radek Brich <radek.brich@devl.cz>
parents:
24
diff
changeset
|
423 |
self.log_notices(conn) |
0 | 424 |
self.put_conn(conn, name) |
425 |
||
26
7f219da7ab71
Add logging mechanism for notices from postgres server. Rename SQL log to "pgmanager_sql".
Radek Brich <radek.brich@devl.cz>
parents:
24
diff
changeset
|
426 |
def log_notices(self, conn): |
7f219da7ab71
Add logging mechanism for notices from postgres server. Rename SQL log to "pgmanager_sql".
Radek Brich <radek.brich@devl.cz>
parents:
24
diff
changeset
|
427 |
for notice in conn.notices: |
7f219da7ab71
Add logging mechanism for notices from postgres server. Rename SQL log to "pgmanager_sql".
Radek Brich <radek.brich@devl.cz>
parents:
24
diff
changeset
|
428 |
log_notices.info(notice.rstrip()) |
7f219da7ab71
Add logging mechanism for notices from postgres server. Rename SQL log to "pgmanager_sql".
Radek Brich <radek.brich@devl.cz>
parents:
24
diff
changeset
|
429 |
conn.notices[:] = [] |
7f219da7ab71
Add logging mechanism for notices from postgres server. Rename SQL log to "pgmanager_sql".
Radek Brich <radek.brich@devl.cz>
parents:
24
diff
changeset
|
430 |
|
70 | 431 |
def wait_for_notify(self, name='default', timeout=None): |
0 | 432 |
'''Wait for asynchronous notifies, return the last one. |
43
a921669e913a
PgManager: rewrite RowDict class.
Radek Brich <radek.brich@devl.cz>
parents:
42
diff
changeset
|
433 |
|
70 | 434 |
*name* -- name of connection, must be created using `create_conn_listen()` |
43
a921669e913a
PgManager: rewrite RowDict class.
Radek Brich <radek.brich@devl.cz>
parents:
42
diff
changeset
|
435 |
|
70 | 436 |
*timeout* -- in seconds, floating point (`None` means wait forever) |
437 |
||
438 |
Returns `None` on timeout. |
|
43
a921669e913a
PgManager: rewrite RowDict class.
Radek Brich <radek.brich@devl.cz>
parents:
42
diff
changeset
|
439 |
|
0 | 440 |
''' |
441 |
conn = self.get_conn(name) |
|
43
a921669e913a
PgManager: rewrite RowDict class.
Radek Brich <radek.brich@devl.cz>
parents:
42
diff
changeset
|
442 |
|
36
e67101c22e83
pgmanager: Add create_conn_listen() which should be used with wait_for_notify. Update wait_for_notify() to not use put_conn(). Add name to ConnectionInfo. Log queries before they are called. Log exceptions. Add notifyexample.
Radek Brich <radek.brich@devl.cz>
parents:
33
diff
changeset
|
443 |
# return any notifies on stack |
e67101c22e83
pgmanager: Add create_conn_listen() which should be used with wait_for_notify. Update wait_for_notify() to not use put_conn(). Add name to ConnectionInfo. Log queries before they are called. Log exceptions. Add notifyexample.
Radek Brich <radek.brich@devl.cz>
parents:
33
diff
changeset
|
444 |
if conn.notifies: |
e67101c22e83
pgmanager: Add create_conn_listen() which should be used with wait_for_notify. Update wait_for_notify() to not use put_conn(). Add name to ConnectionInfo. Log queries before they are called. Log exceptions. Add notifyexample.
Radek Brich <radek.brich@devl.cz>
parents:
33
diff
changeset
|
445 |
return conn.notifies.pop() |
e67101c22e83
pgmanager: Add create_conn_listen() which should be used with wait_for_notify. Update wait_for_notify() to not use put_conn(). Add name to ConnectionInfo. Log queries before they are called. Log exceptions. Add notifyexample.
Radek Brich <radek.brich@devl.cz>
parents:
33
diff
changeset
|
446 |
|
e67101c22e83
pgmanager: Add create_conn_listen() which should be used with wait_for_notify. Update wait_for_notify() to not use put_conn(). Add name to ConnectionInfo. Log queries before they are called. Log exceptions. Add notifyexample.
Radek Brich <radek.brich@devl.cz>
parents:
33
diff
changeset
|
447 |
if select.select([conn], [], [], timeout) == ([], [], []): |
e67101c22e83
pgmanager: Add create_conn_listen() which should be used with wait_for_notify. Update wait_for_notify() to not use put_conn(). Add name to ConnectionInfo. Log queries before they are called. Log exceptions. Add notifyexample.
Radek Brich <radek.brich@devl.cz>
parents:
33
diff
changeset
|
448 |
# timeout |
e67101c22e83
pgmanager: Add create_conn_listen() which should be used with wait_for_notify. Update wait_for_notify() to not use put_conn(). Add name to ConnectionInfo. Log queries before they are called. Log exceptions. Add notifyexample.
Radek Brich <radek.brich@devl.cz>
parents:
33
diff
changeset
|
449 |
return None |
e67101c22e83
pgmanager: Add create_conn_listen() which should be used with wait_for_notify. Update wait_for_notify() to not use put_conn(). Add name to ConnectionInfo. Log queries before they are called. Log exceptions. Add notifyexample.
Radek Brich <radek.brich@devl.cz>
parents:
33
diff
changeset
|
450 |
else: |
e67101c22e83
pgmanager: Add create_conn_listen() which should be used with wait_for_notify. Update wait_for_notify() to not use put_conn(). Add name to ConnectionInfo. Log queries before they are called. Log exceptions. Add notifyexample.
Radek Brich <radek.brich@devl.cz>
parents:
33
diff
changeset
|
451 |
conn.poll() |
e67101c22e83
pgmanager: Add create_conn_listen() which should be used with wait_for_notify. Update wait_for_notify() to not use put_conn(). Add name to ConnectionInfo. Log queries before they are called. Log exceptions. Add notifyexample.
Radek Brich <radek.brich@devl.cz>
parents:
33
diff
changeset
|
452 |
|
e67101c22e83
pgmanager: Add create_conn_listen() which should be used with wait_for_notify. Update wait_for_notify() to not use put_conn(). Add name to ConnectionInfo. Log queries before they are called. Log exceptions. Add notifyexample.
Radek Brich <radek.brich@devl.cz>
parents:
33
diff
changeset
|
453 |
# return just the last notify (we do not care for older ones) |
0 | 454 |
if conn.notifies: |
455 |
return conn.notifies.pop() |
|
36
e67101c22e83
pgmanager: Add create_conn_listen() which should be used with wait_for_notify. Update wait_for_notify() to not use put_conn(). Add name to ConnectionInfo. Log queries before they are called. Log exceptions. Add notifyexample.
Radek Brich <radek.brich@devl.cz>
parents:
33
diff
changeset
|
456 |
return None |
0 | 457 |
|
8
2911935c524d
pgmanager: Add keep_alive support.
Radek Brich <radek.brich@devl.cz>
parents:
7
diff
changeset
|
458 |
def _connect(self, ci): |
2911935c524d
pgmanager: Add keep_alive support.
Radek Brich <radek.brich@devl.cz>
parents:
7
diff
changeset
|
459 |
conn = psycopg2.connect(ci.dsn, connection_factory=Connection) |
36
e67101c22e83
pgmanager: Add create_conn_listen() which should be used with wait_for_notify. Update wait_for_notify() to not use put_conn(). Add name to ConnectionInfo. Log queries before they are called. Log exceptions. Add notifyexample.
Radek Brich <radek.brich@devl.cz>
parents:
33
diff
changeset
|
460 |
conn.name = ci.name |
19
e526ca146fa9
Add documentation for create_conn(). Fix keep_alive - do not crash if socket settings are not supported.
Radek Brich <radek.brich@devl.cz>
parents:
9
diff
changeset
|
461 |
if ci.keep_alive: |
e526ca146fa9
Add documentation for create_conn(). Fix keep_alive - do not crash if socket settings are not supported.
Radek Brich <radek.brich@devl.cz>
parents:
9
diff
changeset
|
462 |
conn.keep_alive() |
8
2911935c524d
pgmanager: Add keep_alive support.
Radek Brich <radek.brich@devl.cz>
parents:
7
diff
changeset
|
463 |
if not ci.isolation_level is None: |
2911935c524d
pgmanager: Add keep_alive support.
Radek Brich <radek.brich@devl.cz>
parents:
7
diff
changeset
|
464 |
conn.set_isolation_level(ci.isolation_level) |
2911935c524d
pgmanager: Add keep_alive support.
Radek Brich <radek.brich@devl.cz>
parents:
7
diff
changeset
|
465 |
if ci.init_statement: |
2911935c524d
pgmanager: Add keep_alive support.
Radek Brich <radek.brich@devl.cz>
parents:
7
diff
changeset
|
466 |
curs = conn.cursor() |
2911935c524d
pgmanager: Add keep_alive support.
Radek Brich <radek.brich@devl.cz>
parents:
7
diff
changeset
|
467 |
curs.execute(ci.init_statement) |
71 | 468 |
curs.connection.commit() |
8
2911935c524d
pgmanager: Add keep_alive support.
Radek Brich <radek.brich@devl.cz>
parents:
7
diff
changeset
|
469 |
curs.close() |
2911935c524d
pgmanager: Add keep_alive support.
Radek Brich <radek.brich@devl.cz>
parents:
7
diff
changeset
|
470 |
return conn |
2911935c524d
pgmanager: Add keep_alive support.
Radek Brich <radek.brich@devl.cz>
parents:
7
diff
changeset
|
471 |
|
0 | 472 |
def _normalize_isolation_level(self, level): |
473 |
if type(level) == str: |
|
474 |
if level.lower() == 'autocommit': |
|
475 |
return psycopg2.extensions.ISOLATION_LEVEL_AUTOCOMMIT |
|
476 |
if level.lower() == 'read_committed': |
|
477 |
return psycopg2.extensions.ISOLATION_LEVEL_READ_COMMITTED |
|
478 |
if level.lower() == 'serializable': |
|
479 |
return psycopg2.extensions.ISOLATION_LEVEL_SERIALIZABLE |
|
81
f709b1c7ca0c
PgManager: Update RowDict, add write support.
Radek Brich <radek.brich@devl.cz>
parents:
80
diff
changeset
|
480 |
raise PgManagerError('Unknown isolation level name: "%s"' % level) |
0 | 481 |
return level |
43
a921669e913a
PgManager: rewrite RowDict class.
Radek Brich <radek.brich@devl.cz>
parents:
42
diff
changeset
|
482 |
|
24
5664afa530e5
PgManager: Add partial support for multiprocessing.
Radek Brich <radek.brich@devl.cz>
parents:
23
diff
changeset
|
483 |
def _check_fork(self): |
5664afa530e5
PgManager: Add partial support for multiprocessing.
Radek Brich <radek.brich@devl.cz>
parents:
23
diff
changeset
|
484 |
'''Check if process was forked (PID has changed). |
43
a921669e913a
PgManager: rewrite RowDict class.
Radek Brich <radek.brich@devl.cz>
parents:
42
diff
changeset
|
485 |
|
24
5664afa530e5
PgManager: Add partial support for multiprocessing.
Radek Brich <radek.brich@devl.cz>
parents:
23
diff
changeset
|
486 |
If it was, clean parent's connections. |
5664afa530e5
PgManager: Add partial support for multiprocessing.
Radek Brich <radek.brich@devl.cz>
parents:
23
diff
changeset
|
487 |
New connections are created for children. |
5664afa530e5
PgManager: Add partial support for multiprocessing.
Radek Brich <radek.brich@devl.cz>
parents:
23
diff
changeset
|
488 |
Known connection credentials are inherited, but not shared. |
43
a921669e913a
PgManager: rewrite RowDict class.
Radek Brich <radek.brich@devl.cz>
parents:
42
diff
changeset
|
489 |
|
24
5664afa530e5
PgManager: Add partial support for multiprocessing.
Radek Brich <radek.brich@devl.cz>
parents:
23
diff
changeset
|
490 |
''' |
5664afa530e5
PgManager: Add partial support for multiprocessing.
Radek Brich <radek.brich@devl.cz>
parents:
23
diff
changeset
|
491 |
if self.pid == multiprocessing.current_process().pid: |
5664afa530e5
PgManager: Add partial support for multiprocessing.
Radek Brich <radek.brich@devl.cz>
parents:
23
diff
changeset
|
492 |
# PID has not changed |
5664afa530e5
PgManager: Add partial support for multiprocessing.
Radek Brich <radek.brich@devl.cz>
parents:
23
diff
changeset
|
493 |
return |
43
a921669e913a
PgManager: rewrite RowDict class.
Radek Brich <radek.brich@devl.cz>
parents:
42
diff
changeset
|
494 |
|
24
5664afa530e5
PgManager: Add partial support for multiprocessing.
Radek Brich <radek.brich@devl.cz>
parents:
23
diff
changeset
|
495 |
# update saved PID |
5664afa530e5
PgManager: Add partial support for multiprocessing.
Radek Brich <radek.brich@devl.cz>
parents:
23
diff
changeset
|
496 |
self.pid = multiprocessing.current_process().pid |
5664afa530e5
PgManager: Add partial support for multiprocessing.
Radek Brich <radek.brich@devl.cz>
parents:
23
diff
changeset
|
497 |
# reinitialize lock |
5664afa530e5
PgManager: Add partial support for multiprocessing.
Radek Brich <radek.brich@devl.cz>
parents:
23
diff
changeset
|
498 |
self.lock = threading.Lock() |
5664afa530e5
PgManager: Add partial support for multiprocessing.
Radek Brich <radek.brich@devl.cz>
parents:
23
diff
changeset
|
499 |
# clean parent's connections |
5664afa530e5
PgManager: Add partial support for multiprocessing.
Radek Brich <radek.brich@devl.cz>
parents:
23
diff
changeset
|
500 |
for name in self.conn_pool: |
5664afa530e5
PgManager: Add partial support for multiprocessing.
Radek Brich <radek.brich@devl.cz>
parents:
23
diff
changeset
|
501 |
self.conn_pool[name] = [] |
0 | 502 |
|
20
73f0d53fef6b
PgManager: Do not add NullHandler to logger. Rewrite get_instance(). ToolBase: fix prepare_conns() method.
Radek Brich <radek.brich@devl.cz>
parents:
19
diff
changeset
|
503 |
@classmethod |
73f0d53fef6b
PgManager: Do not add NullHandler to logger. Rewrite get_instance(). ToolBase: fix prepare_conns() method.
Radek Brich <radek.brich@devl.cz>
parents:
19
diff
changeset
|
504 |
def get_instance(cls): |
73f0d53fef6b
PgManager: Do not add NullHandler to logger. Rewrite get_instance(). ToolBase: fix prepare_conns() method.
Radek Brich <radek.brich@devl.cz>
parents:
19
diff
changeset
|
505 |
if not hasattr(cls, '_instance'): |
73f0d53fef6b
PgManager: Do not add NullHandler to logger. Rewrite get_instance(). ToolBase: fix prepare_conns() method.
Radek Brich <radek.brich@devl.cz>
parents:
19
diff
changeset
|
506 |
cls._instance = cls() |
73f0d53fef6b
PgManager: Do not add NullHandler to logger. Rewrite get_instance(). ToolBase: fix prepare_conns() method.
Radek Brich <radek.brich@devl.cz>
parents:
19
diff
changeset
|
507 |
return cls._instance |
0 | 508 |
|
509 |
||
510 |
def get_instance(): |
|
20
73f0d53fef6b
PgManager: Do not add NullHandler to logger. Rewrite get_instance(). ToolBase: fix prepare_conns() method.
Radek Brich <radek.brich@devl.cz>
parents:
19
diff
changeset
|
511 |
return PgManager.get_instance() |
0 | 512 |