diff options
Diffstat (limited to 'python/skytools/psycopgwrapper.py')
| -rw-r--r-- | python/skytools/psycopgwrapper.py | 51 |
1 files changed, 3 insertions, 48 deletions
diff --git a/python/skytools/psycopgwrapper.py b/python/skytools/psycopgwrapper.py index 753700cd..923b6f39 100644 --- a/python/skytools/psycopgwrapper.py +++ b/python/skytools/psycopgwrapper.py @@ -55,7 +55,7 @@ Plain .fetchall() / .fetchone() give exact same result. """ # no exports -__all__ = ['connect_database', 'set_tcp_keepalive', 'DBError'] +__all__ = ['connect_database', 'DBError'] ##from psycopg2.psycopg1 import connect as _pgconnect # psycopg2.psycopg1.cursor is too backwards compatible, @@ -67,6 +67,8 @@ import psycopg2.extensions, psycopg2.extras from psycopg2 import Error as DBError import skytools +from skytools.sockutil import set_tcp_keepalive + class _CompatRow(psycopg2.extras.DictRow): """Make DictRow more dict-like.""" __slots__ = ('_index',) @@ -104,53 +106,6 @@ class _CompatConnection(psycopg2.extensions.connection): def cursor(self): return psycopg2.extensions.connection.cursor(self, cursor_factory = _CompatCursor) -def set_tcp_keepalive(fd, keepalive = True, - tcp_keepidle = 4 * 60, - tcp_keepcnt = 4, - tcp_keepintvl = 15): - """Turn on TCP keepalive. The fd can be either numeric or socket - object with 'fileno' method. - - OS defaults for SO_KEEPALIVE=1: - - Linux: (7200, 9, 75) - can configure all. - - MacOS: (7200, 8, 75) - can configure only tcp_keepidle. - - Win32: (7200, 5|10, 1) - can configure tcp_keepidle and tcp_keepintvl. - Python needs SIO_KEEPALIVE_VALS support in socket.ioctl to enable it. - - Our defaults: (240, 4, 15). - """ - - # usable on this OS? - if not hasattr(socket, 'SO_KEEPALIVE') or not hasattr(socket, 'fromfd'): - return - - # get numeric fd and cast to socket - if hasattr(fd, 'fileno'): - fd = fd.fileno() - s = socket.fromfd(fd, socket.AF_INET, socket.SOCK_STREAM) - - # skip if unix socket - if type(s.getsockname()) != type(()): - return - - # turn on keepalive on the connection - if keepalive: - s.setsockopt(socket.SOL_SOCKET, socket.SO_KEEPALIVE, 1) - if hasattr(socket, 'TCP_KEEPCNT'): - s.setsockopt(socket.IPPROTO_TCP, getattr(socket, 'TCP_KEEPIDLE'), tcp_keepidle) - s.setsockopt(socket.IPPROTO_TCP, getattr(socket, 'TCP_KEEPCNT'), tcp_keepcnt) - s.setsockopt(socket.IPPROTO_TCP, getattr(socket, 'TCP_KEEPINTVL'), tcp_keepintvl) - elif hasattr(socket, 'TCP_KEEPALIVE'): - s.setsockopt(socket.IPPROTO_TCP, getattr(socket, 'TCP_KEEPALIVE'), tcp_keepidle) - elif sys.platform == 'darwin': - TCP_KEEPALIVE = 0x10 - s.setsockopt(socket.IPPROTO_TCP, TCP_KEEPALIVE, tcp_keepidle) - elif sys.platform == 'win32': - #s.ioctl(SIO_KEEPALIVE_VALS, (1, tcp_keepidle*1000, tcp_keepintvl*1000)) - pass - else: - s.setsockopt(socket.SOL_SOCKET, socket.SO_KEEPALIVE, 0) - def connect_database(connstr, keepalive = True, tcp_keepidle = 4 * 60, # 7200 tcp_keepcnt = 4, # 9 |