Mercurial > libervia-pubsub
comparison sat_pubsub/tap.py @ 328:ae37289007c3
fixed database config : None values can't be used anymore
author | Goffi <goffi@goffi.org> |
---|---|
date | Fri, 03 Mar 2017 08:35:34 +0100 |
parents | 8496af26be45 |
children | 83122f15b993 |
comparison
equal
deleted
inserted
replaced
327:6662cc9519cc | 328:ae37289007c3 |
---|---|
106 | 106 |
107 if config['backend'] == 'pgsql': | 107 if config['backend'] == 'pgsql': |
108 from twisted.enterprise import adbapi | 108 from twisted.enterprise import adbapi |
109 from sat_pubsub.pgsql_storage import Storage | 109 from sat_pubsub.pgsql_storage import Storage |
110 from psycopg2.extras import NamedTupleConnection | 110 from psycopg2.extras import NamedTupleConnection |
111 keys_map = { | |
112 'dbuser': 'user', | |
113 'dbpass': 'password', | |
114 'dbname': 'database', | |
115 'dbhost': 'host', | |
116 'dbport': 'port', | |
117 } | |
118 kwargs = {} | |
119 for config_k, k in keys_map.iteritems(): | |
120 v = config.get(config_k) | |
121 if v is None: | |
122 continue | |
123 kwargs[k] = v | |
111 dbpool = adbapi.ConnectionPool('psycopg2', | 124 dbpool = adbapi.ConnectionPool('psycopg2', |
112 user=config['dbuser'], | |
113 password=config['dbpass'], | |
114 database=config['dbname'], | |
115 host=config['dbhost'], | |
116 port=config['dbport'], | |
117 cp_reconnect=True, | 125 cp_reconnect=True, |
118 client_encoding='utf-8', | 126 client_encoding='utf-8', |
119 connection_factory=NamedTupleConnection, | 127 connection_factory=NamedTupleConnection, |
128 **kwargs | |
120 ) | 129 ) |
121 st = Storage(dbpool) | 130 st = Storage(dbpool) |
122 elif config['backend'] == 'memory': | 131 elif config['backend'] == 'memory': |
123 from sat_pubsub.memory_storage import Storage | 132 from sat_pubsub.memory_storage import Storage |
124 st = Storage() | 133 st = Storage() |