Mercurial > libervia-pubsub
comparison sat_pubsub/tap.py @ 234:51af2ed8bd50
replaced idavoll imports by sat_pubsub imports
author | Goffi <goffi@goffi.org> |
---|---|
date | Thu, 17 May 2012 01:53:12 +0200 |
parents | 564ae55219e1 |
children | 64f780413b82 |
comparison
equal
deleted
inserted
replaced
233:564ae55219e1 | 234:51af2ed8bd50 |
---|---|
60 from wokkel.disco import DiscoHandler | 60 from wokkel.disco import DiscoHandler |
61 from wokkel.generic import FallbackHandler, VersionHandler | 61 from wokkel.generic import FallbackHandler, VersionHandler |
62 from wokkel.iwokkel import IPubSubResource | 62 from wokkel.iwokkel import IPubSubResource |
63 from wokkel.pubsub import PubSubService | 63 from wokkel.pubsub import PubSubService |
64 | 64 |
65 from idavoll import __version__ | 65 from sat_pubsub import __version__ |
66 from idavoll.backend import BackendService | 66 from sat_pubsub.backend import BackendService |
67 | 67 |
68 class Options(usage.Options): | 68 class Options(usage.Options): |
69 optParameters = [ | 69 optParameters = [ |
70 ('jid', None, 'pubsub', 'JID this component will be available at'), | 70 ('jid', None, 'pubsub', 'JID this component will be available at'), |
71 ('secret', None, 'secret', 'Jabber server component secret'), | 71 ('secret', None, 'secret', 'Jabber server component secret'), |
97 | 97 |
98 # Create backend service with storage | 98 # Create backend service with storage |
99 | 99 |
100 if config['backend'] == 'pgsql': | 100 if config['backend'] == 'pgsql': |
101 from twisted.enterprise import adbapi | 101 from twisted.enterprise import adbapi |
102 from idavoll.pgsql_storage import Storage | 102 from sat_pubsub.pgsql_storage import Storage |
103 dbpool = adbapi.ConnectionPool('psycopg2', | 103 dbpool = adbapi.ConnectionPool('psycopg2', |
104 user=config['dbuser'], | 104 user=config['dbuser'], |
105 password=config['dbpass'], | 105 password=config['dbpass'], |
106 database=config['dbname'], | 106 database=config['dbname'], |
107 host=config['dbhost'], | 107 host=config['dbhost'], |
109 cp_reconnect=True, | 109 cp_reconnect=True, |
110 client_encoding='utf-8', | 110 client_encoding='utf-8', |
111 ) | 111 ) |
112 st = Storage(dbpool) | 112 st = Storage(dbpool) |
113 elif config['backend'] == 'memory': | 113 elif config['backend'] == 'memory': |
114 from idavoll.memory_storage import Storage | 114 from sat_pubsub.memory_storage import Storage |
115 st = Storage() | 115 st = Storage() |
116 | 116 |
117 bs = BackendService(st) | 117 bs = BackendService(st) |
118 bs.setName('backend') | 118 bs.setName('backend') |
119 bs.setServiceParent(s) | 119 bs.setServiceParent(s) |