annotate idavoll/idavoll.py @ 138:635e433810ef

Actually test whether the item was indeed stored.
author Ralph Meijer <ralphm@ik.nu>
date Mon, 25 Apr 2005 13:02:37 +0000
parents 3d77f3808bfa
children d79f0816f6c3
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
105
8d8946e67fcb Move to Twisted 2.0.
Ralph Meijer <ralphm@ik.nu>
parents: 102
diff changeset
1 from twisted.words.protocols.jabber import component
1
4cc41776b7d7 Initial revision
Ralph Meijer <ralphm@ik.nu>
parents:
diff changeset
2 from twisted.application import service
67
cdf17c4d3bf9 Made returning disco info use deferreds.
Ralph Meijer <ralphm@ik.nu>
parents: 63
diff changeset
3 from twisted.internet import defer
32
ddc08757ec1d Fire up several component.IServices that match the backend Services.
Ralph Meijer <ralphm@ik.nu>
parents: 26
diff changeset
4 import backend
1
4cc41776b7d7 Initial revision
Ralph Meijer <ralphm@ik.nu>
parents:
diff changeset
5 import pubsub
4cc41776b7d7 Initial revision
Ralph Meijer <ralphm@ik.nu>
parents:
diff changeset
6 import xmpp_error
73
5d7a924ebddb Reworked disco support.
Ralph Meijer <ralphm@ik.nu>
parents: 67
diff changeset
7 import disco
1
4cc41776b7d7 Initial revision
Ralph Meijer <ralphm@ik.nu>
parents:
diff changeset
8
4cc41776b7d7 Initial revision
Ralph Meijer <ralphm@ik.nu>
parents:
diff changeset
9 import sys
4cc41776b7d7 Initial revision
Ralph Meijer <ralphm@ik.nu>
parents:
diff changeset
10
8
688992a789e4 Add disco support
Ralph Meijer <ralphm@ik.nu>
parents: 1
diff changeset
11 NS_VERSION = 'jabber:iq:version'
688992a789e4 Add disco support
Ralph Meijer <ralphm@ik.nu>
parents: 1
diff changeset
12
1
4cc41776b7d7 Initial revision
Ralph Meijer <ralphm@ik.nu>
parents:
diff changeset
13 IQ_GET = '/iq[@type="get"]'
4cc41776b7d7 Initial revision
Ralph Meijer <ralphm@ik.nu>
parents:
diff changeset
14 IQ_SET = '/iq[@type="set"]'
8
688992a789e4 Add disco support
Ralph Meijer <ralphm@ik.nu>
parents: 1
diff changeset
15 VERSION = IQ_GET + '/query[@xmlns="' + NS_VERSION + '"]'
73
5d7a924ebddb Reworked disco support.
Ralph Meijer <ralphm@ik.nu>
parents: 67
diff changeset
16 DISCO_INFO = IQ_GET + '/query[@xmlns="' + disco.NS_INFO + '"]'
5d7a924ebddb Reworked disco support.
Ralph Meijer <ralphm@ik.nu>
parents: 67
diff changeset
17 DISCO_ITEMS = IQ_GET + '/query[@xmlns="' + disco.NS_ITEMS + '"]'
1
4cc41776b7d7 Initial revision
Ralph Meijer <ralphm@ik.nu>
parents:
diff changeset
18
4cc41776b7d7 Initial revision
Ralph Meijer <ralphm@ik.nu>
parents:
diff changeset
19 class IdavollService(component.Service):
4cc41776b7d7 Initial revision
Ralph Meijer <ralphm@ik.nu>
parents:
diff changeset
20
32
ddc08757ec1d Fire up several component.IServices that match the backend Services.
Ralph Meijer <ralphm@ik.nu>
parents: 26
diff changeset
21 def componentConnected(self, xmlstream):
ddc08757ec1d Fire up several component.IServices that match the backend Services.
Ralph Meijer <ralphm@ik.nu>
parents: 26
diff changeset
22 self.xmlstream = xmlstream
ddc08757ec1d Fire up several component.IServices that match the backend Services.
Ralph Meijer <ralphm@ik.nu>
parents: 26
diff changeset
23 xmlstream.addObserver(VERSION, self.onVersion, 1)
ddc08757ec1d Fire up several component.IServices that match the backend Services.
Ralph Meijer <ralphm@ik.nu>
parents: 26
diff changeset
24 xmlstream.addObserver(DISCO_INFO, self.onDiscoInfo, 1)
ddc08757ec1d Fire up several component.IServices that match the backend Services.
Ralph Meijer <ralphm@ik.nu>
parents: 26
diff changeset
25 xmlstream.addObserver(DISCO_ITEMS, self.onDiscoItems, 1)
ddc08757ec1d Fire up several component.IServices that match the backend Services.
Ralph Meijer <ralphm@ik.nu>
parents: 26
diff changeset
26 xmlstream.addObserver(IQ_GET, self.iqFallback, -1)
ddc08757ec1d Fire up several component.IServices that match the backend Services.
Ralph Meijer <ralphm@ik.nu>
parents: 26
diff changeset
27 xmlstream.addObserver(IQ_SET, self.iqFallback, -1)
8
688992a789e4 Add disco support
Ralph Meijer <ralphm@ik.nu>
parents: 1
diff changeset
28
73
5d7a924ebddb Reworked disco support.
Ralph Meijer <ralphm@ik.nu>
parents: 67
diff changeset
29 def get_disco_info(self, node):
5d7a924ebddb Reworked disco support.
Ralph Meijer <ralphm@ik.nu>
parents: 67
diff changeset
30 info = []
57
445a61f872b6 Use NodeCreationService for pgsql backend, too.
Ralph Meijer <ralphm@ik.nu>
parents: 52
diff changeset
31
32
ddc08757ec1d Fire up several component.IServices that match the backend Services.
Ralph Meijer <ralphm@ik.nu>
parents: 26
diff changeset
32 if not node:
73
5d7a924ebddb Reworked disco support.
Ralph Meijer <ralphm@ik.nu>
parents: 67
diff changeset
33 info.append(disco.Feature(disco.NS_ITEMS))
5d7a924ebddb Reworked disco support.
Ralph Meijer <ralphm@ik.nu>
parents: 67
diff changeset
34 info.append(disco.Feature(NS_VERSION))
57
445a61f872b6 Use NodeCreationService for pgsql backend, too.
Ralph Meijer <ralphm@ik.nu>
parents: 52
diff changeset
35
73
5d7a924ebddb Reworked disco support.
Ralph Meijer <ralphm@ik.nu>
parents: 67
diff changeset
36 return defer.succeed(info)
32
ddc08757ec1d Fire up several component.IServices that match the backend Services.
Ralph Meijer <ralphm@ik.nu>
parents: 26
diff changeset
37
ddc08757ec1d Fire up several component.IServices that match the backend Services.
Ralph Meijer <ralphm@ik.nu>
parents: 26
diff changeset
38 def onVersion(self, iq):
ddc08757ec1d Fire up several component.IServices that match the backend Services.
Ralph Meijer <ralphm@ik.nu>
parents: 26
diff changeset
39 iq.swapAttributeValues("to", "from")
ddc08757ec1d Fire up several component.IServices that match the backend Services.
Ralph Meijer <ralphm@ik.nu>
parents: 26
diff changeset
40 iq["type"] = "result"
ddc08757ec1d Fire up several component.IServices that match the backend Services.
Ralph Meijer <ralphm@ik.nu>
parents: 26
diff changeset
41 name = iq.addElement("name", None, 'Idavoll')
ddc08757ec1d Fire up several component.IServices that match the backend Services.
Ralph Meijer <ralphm@ik.nu>
parents: 26
diff changeset
42 version = iq.addElement("version", None, '0.1')
ddc08757ec1d Fire up several component.IServices that match the backend Services.
Ralph Meijer <ralphm@ik.nu>
parents: 26
diff changeset
43 self.send(iq)
ddc08757ec1d Fire up several component.IServices that match the backend Services.
Ralph Meijer <ralphm@ik.nu>
parents: 26
diff changeset
44 iq.handled = True
1
4cc41776b7d7 Initial revision
Ralph Meijer <ralphm@ik.nu>
parents:
diff changeset
45
32
ddc08757ec1d Fire up several component.IServices that match the backend Services.
Ralph Meijer <ralphm@ik.nu>
parents: 26
diff changeset
46 def onDiscoInfo(self, iq):
73
5d7a924ebddb Reworked disco support.
Ralph Meijer <ralphm@ik.nu>
parents: 67
diff changeset
47 dl = []
32
ddc08757ec1d Fire up several component.IServices that match the backend Services.
Ralph Meijer <ralphm@ik.nu>
parents: 26
diff changeset
48 node = iq.query.getAttribute("node")
8
688992a789e4 Add disco support
Ralph Meijer <ralphm@ik.nu>
parents: 1
diff changeset
49
32
ddc08757ec1d Fire up several component.IServices that match the backend Services.
Ralph Meijer <ralphm@ik.nu>
parents: 26
diff changeset
50 for c in self.parent:
105
8d8946e67fcb Move to Twisted 2.0.
Ralph Meijer <ralphm@ik.nu>
parents: 102
diff changeset
51 if component.IService.providedBy(c):
73
5d7a924ebddb Reworked disco support.
Ralph Meijer <ralphm@ik.nu>
parents: 67
diff changeset
52 if hasattr(c, "get_disco_info"):
5d7a924ebddb Reworked disco support.
Ralph Meijer <ralphm@ik.nu>
parents: 67
diff changeset
53 dl.append(c.get_disco_info(node))
92
878a5b7697f2 Consume errors in DeferredLists.
Ralph Meijer <ralphm@ik.nu>
parents: 91
diff changeset
54 d = defer.DeferredList(dl, fireOnOneErrback=1, consumeErrors=1)
102
f4d725a94202 Fix bug in how errors are handled in disco info request.
Ralph Meijer <ralphm@ik.nu>
parents: 101
diff changeset
55 d.addErrback(self._error, iq)
67
cdf17c4d3bf9 Made returning disco info use deferreds.
Ralph Meijer <ralphm@ik.nu>
parents: 63
diff changeset
56 d.addCallback(self._disco_info_results, iq, node)
cdf17c4d3bf9 Made returning disco info use deferreds.
Ralph Meijer <ralphm@ik.nu>
parents: 63
diff changeset
57 d.addCallback(self.send)
cdf17c4d3bf9 Made returning disco info use deferreds.
Ralph Meijer <ralphm@ik.nu>
parents: 63
diff changeset
58
cdf17c4d3bf9 Made returning disco info use deferreds.
Ralph Meijer <ralphm@ik.nu>
parents: 63
diff changeset
59 iq.handled = True
cdf17c4d3bf9 Made returning disco info use deferreds.
Ralph Meijer <ralphm@ik.nu>
parents: 63
diff changeset
60
73
5d7a924ebddb Reworked disco support.
Ralph Meijer <ralphm@ik.nu>
parents: 67
diff changeset
61 def _disco_info_results(self, results, iq, node):
5d7a924ebddb Reworked disco support.
Ralph Meijer <ralphm@ik.nu>
parents: 67
diff changeset
62 info = []
5d7a924ebddb Reworked disco support.
Ralph Meijer <ralphm@ik.nu>
parents: 67
diff changeset
63 for i in results:
5d7a924ebddb Reworked disco support.
Ralph Meijer <ralphm@ik.nu>
parents: 67
diff changeset
64 info.extend(i[1])
67
cdf17c4d3bf9 Made returning disco info use deferreds.
Ralph Meijer <ralphm@ik.nu>
parents: 63
diff changeset
65
73
5d7a924ebddb Reworked disco support.
Ralph Meijer <ralphm@ik.nu>
parents: 67
diff changeset
66 if node and not info:
67
cdf17c4d3bf9 Made returning disco info use deferreds.
Ralph Meijer <ralphm@ik.nu>
parents: 63
diff changeset
67 return xmpp_error.error_from_iq(iq, 'item-not-found')
32
ddc08757ec1d Fire up several component.IServices that match the backend Services.
Ralph Meijer <ralphm@ik.nu>
parents: 26
diff changeset
68 else:
ddc08757ec1d Fire up several component.IServices that match the backend Services.
Ralph Meijer <ralphm@ik.nu>
parents: 26
diff changeset
69 iq.swapAttributeValues("to", "from")
ddc08757ec1d Fire up several component.IServices that match the backend Services.
Ralph Meijer <ralphm@ik.nu>
parents: 26
diff changeset
70 iq["type"] = "result"
101
b75fcc554358 Added support for disco info meta data.
Ralph Meijer <ralphm@ik.nu>
parents: 97
diff changeset
71 for item in info:
b75fcc554358 Added support for disco info meta data.
Ralph Meijer <ralphm@ik.nu>
parents: 97
diff changeset
72 #domish.Element.addChild should probably do this for all
b75fcc554358 Added support for disco info meta data.
Ralph Meijer <ralphm@ik.nu>
parents: 97
diff changeset
73 # subclasses of Element
b75fcc554358 Added support for disco info meta data.
Ralph Meijer <ralphm@ik.nu>
parents: 97
diff changeset
74 item.parent = iq.query
b75fcc554358 Added support for disco info meta data.
Ralph Meijer <ralphm@ik.nu>
parents: 97
diff changeset
75
b75fcc554358 Added support for disco info meta data.
Ralph Meijer <ralphm@ik.nu>
parents: 97
diff changeset
76 iq.query.addChild(item)
67
cdf17c4d3bf9 Made returning disco info use deferreds.
Ralph Meijer <ralphm@ik.nu>
parents: 63
diff changeset
77
cdf17c4d3bf9 Made returning disco info use deferreds.
Ralph Meijer <ralphm@ik.nu>
parents: 63
diff changeset
78 return iq
cdf17c4d3bf9 Made returning disco info use deferreds.
Ralph Meijer <ralphm@ik.nu>
parents: 63
diff changeset
79
101
b75fcc554358 Added support for disco info meta data.
Ralph Meijer <ralphm@ik.nu>
parents: 97
diff changeset
80 def _error(self, result, iq):
b75fcc554358 Added support for disco info meta data.
Ralph Meijer <ralphm@ik.nu>
parents: 97
diff changeset
81 print "Got error on index %d:" % result.value[1]
b75fcc554358 Added support for disco info meta data.
Ralph Meijer <ralphm@ik.nu>
parents: 97
diff changeset
82 result.value[0].printBriefTraceback()
89
ccf699adae5e Merge from RELENG_0: Fix bug in handling uncaught exceptions.
Ralph Meijer <ralphm@ik.nu>
parents: 85
diff changeset
83 return xmpp_error.error_from_iq(iq, 'internal-server-error')
8
688992a789e4 Add disco support
Ralph Meijer <ralphm@ik.nu>
parents: 1
diff changeset
84
32
ddc08757ec1d Fire up several component.IServices that match the backend Services.
Ralph Meijer <ralphm@ik.nu>
parents: 26
diff changeset
85 def onDiscoItems(self, iq):
73
5d7a924ebddb Reworked disco support.
Ralph Meijer <ralphm@ik.nu>
parents: 67
diff changeset
86 dl = []
5d7a924ebddb Reworked disco support.
Ralph Meijer <ralphm@ik.nu>
parents: 67
diff changeset
87 node = iq.query.getAttribute("node")
5d7a924ebddb Reworked disco support.
Ralph Meijer <ralphm@ik.nu>
parents: 67
diff changeset
88
5d7a924ebddb Reworked disco support.
Ralph Meijer <ralphm@ik.nu>
parents: 67
diff changeset
89 for c in self.parent:
105
8d8946e67fcb Move to Twisted 2.0.
Ralph Meijer <ralphm@ik.nu>
parents: 102
diff changeset
90 if component.IService.providedBy(c):
73
5d7a924ebddb Reworked disco support.
Ralph Meijer <ralphm@ik.nu>
parents: 67
diff changeset
91 if hasattr(c, "get_disco_items"):
5d7a924ebddb Reworked disco support.
Ralph Meijer <ralphm@ik.nu>
parents: 67
diff changeset
92 dl.append(c.get_disco_items(node))
92
878a5b7697f2 Consume errors in DeferredLists.
Ralph Meijer <ralphm@ik.nu>
parents: 91
diff changeset
93 d = defer.DeferredList(dl, fireOnOneErrback=1, consumeErrors=1)
102
f4d725a94202 Fix bug in how errors are handled in disco info request.
Ralph Meijer <ralphm@ik.nu>
parents: 101
diff changeset
94 d.addErrback(self._error, iq)
73
5d7a924ebddb Reworked disco support.
Ralph Meijer <ralphm@ik.nu>
parents: 67
diff changeset
95 d.addCallback(self._disco_items_result, iq, node)
5d7a924ebddb Reworked disco support.
Ralph Meijer <ralphm@ik.nu>
parents: 67
diff changeset
96 d.addCallback(self.send)
5d7a924ebddb Reworked disco support.
Ralph Meijer <ralphm@ik.nu>
parents: 67
diff changeset
97
5d7a924ebddb Reworked disco support.
Ralph Meijer <ralphm@ik.nu>
parents: 67
diff changeset
98 iq.handled = True
5d7a924ebddb Reworked disco support.
Ralph Meijer <ralphm@ik.nu>
parents: 67
diff changeset
99
5d7a924ebddb Reworked disco support.
Ralph Meijer <ralphm@ik.nu>
parents: 67
diff changeset
100 def _disco_items_result(self, results, iq, node):
5d7a924ebddb Reworked disco support.
Ralph Meijer <ralphm@ik.nu>
parents: 67
diff changeset
101 items = []
5d7a924ebddb Reworked disco support.
Ralph Meijer <ralphm@ik.nu>
parents: 67
diff changeset
102
5d7a924ebddb Reworked disco support.
Ralph Meijer <ralphm@ik.nu>
parents: 67
diff changeset
103 for i in results:
5d7a924ebddb Reworked disco support.
Ralph Meijer <ralphm@ik.nu>
parents: 67
diff changeset
104 items.extend(i[1])
5d7a924ebddb Reworked disco support.
Ralph Meijer <ralphm@ik.nu>
parents: 67
diff changeset
105
32
ddc08757ec1d Fire up several component.IServices that match the backend Services.
Ralph Meijer <ralphm@ik.nu>
parents: 26
diff changeset
106 iq.swapAttributeValues("to", "from")
ddc08757ec1d Fire up several component.IServices that match the backend Services.
Ralph Meijer <ralphm@ik.nu>
parents: 26
diff changeset
107 iq["type"] = "result"
73
5d7a924ebddb Reworked disco support.
Ralph Meijer <ralphm@ik.nu>
parents: 67
diff changeset
108 iq.query.children = items
5d7a924ebddb Reworked disco support.
Ralph Meijer <ralphm@ik.nu>
parents: 67
diff changeset
109
5d7a924ebddb Reworked disco support.
Ralph Meijer <ralphm@ik.nu>
parents: 67
diff changeset
110 return iq
32
ddc08757ec1d Fire up several component.IServices that match the backend Services.
Ralph Meijer <ralphm@ik.nu>
parents: 26
diff changeset
111
ddc08757ec1d Fire up several component.IServices that match the backend Services.
Ralph Meijer <ralphm@ik.nu>
parents: 26
diff changeset
112 def iqFallback(self, iq):
ddc08757ec1d Fire up several component.IServices that match the backend Services.
Ralph Meijer <ralphm@ik.nu>
parents: 26
diff changeset
113 if iq.handled == True:
ddc08757ec1d Fire up several component.IServices that match the backend Services.
Ralph Meijer <ralphm@ik.nu>
parents: 26
diff changeset
114 return
1
4cc41776b7d7 Initial revision
Ralph Meijer <ralphm@ik.nu>
parents:
diff changeset
115
32
ddc08757ec1d Fire up several component.IServices that match the backend Services.
Ralph Meijer <ralphm@ik.nu>
parents: 26
diff changeset
116 self.send(xmpp_error.error_from_iq(iq, 'service-unavailable'))
1
4cc41776b7d7 Initial revision
Ralph Meijer <ralphm@ik.nu>
parents:
diff changeset
117
76
66fac7cd9edc Added -v (--verbose) flag to print out all traffic.
Ralph Meijer <ralphm@ik.nu>
parents: 75
diff changeset
118 class LogService(component.Service):
66fac7cd9edc Added -v (--verbose) flag to print out all traffic.
Ralph Meijer <ralphm@ik.nu>
parents: 75
diff changeset
119
66fac7cd9edc Added -v (--verbose) flag to print out all traffic.
Ralph Meijer <ralphm@ik.nu>
parents: 75
diff changeset
120 def transportConnected(self, xmlstream):
66fac7cd9edc Added -v (--verbose) flag to print out all traffic.
Ralph Meijer <ralphm@ik.nu>
parents: 75
diff changeset
121 xmlstream.rawDataInFn = self.rawDataIn
66fac7cd9edc Added -v (--verbose) flag to print out all traffic.
Ralph Meijer <ralphm@ik.nu>
parents: 75
diff changeset
122 xmlstream.rawDataOutFn = self.rawDataOut
66fac7cd9edc Added -v (--verbose) flag to print out all traffic.
Ralph Meijer <ralphm@ik.nu>
parents: 75
diff changeset
123
66fac7cd9edc Added -v (--verbose) flag to print out all traffic.
Ralph Meijer <ralphm@ik.nu>
parents: 75
diff changeset
124 def rawDataIn(self, buf):
78
a7196ca7cefd Fixed bug in LogService with non-ascii chars.
Ralph Meijer <ralphm@ik.nu>
parents: 76
diff changeset
125 print "RECV: %s" % unicode(buf, 'utf-8').encode('ascii', 'replace')
76
66fac7cd9edc Added -v (--verbose) flag to print out all traffic.
Ralph Meijer <ralphm@ik.nu>
parents: 75
diff changeset
126
66fac7cd9edc Added -v (--verbose) flag to print out all traffic.
Ralph Meijer <ralphm@ik.nu>
parents: 75
diff changeset
127 def rawDataOut(self, buf):
78
a7196ca7cefd Fixed bug in LogService with non-ascii chars.
Ralph Meijer <ralphm@ik.nu>
parents: 76
diff changeset
128 print "SEND: %s" % unicode(buf, 'utf-8').encode('ascii', 'replace')
76
66fac7cd9edc Added -v (--verbose) flag to print out all traffic.
Ralph Meijer <ralphm@ik.nu>
parents: 75
diff changeset
129
1
4cc41776b7d7 Initial revision
Ralph Meijer <ralphm@ik.nu>
parents:
diff changeset
130 def makeService(config):
32
ddc08757ec1d Fire up several component.IServices that match the backend Services.
Ralph Meijer <ralphm@ik.nu>
parents: 26
diff changeset
131 serviceCollection = service.MultiService()
1
4cc41776b7d7 Initial revision
Ralph Meijer <ralphm@ik.nu>
parents:
diff changeset
132
32
ddc08757ec1d Fire up several component.IServices that match the backend Services.
Ralph Meijer <ralphm@ik.nu>
parents: 26
diff changeset
133 # set up Jabber Component
ddc08757ec1d Fire up several component.IServices that match the backend Services.
Ralph Meijer <ralphm@ik.nu>
parents: 26
diff changeset
134 sm = component.buildServiceManager(config["jid"], config["secret"],
ddc08757ec1d Fire up several component.IServices that match the backend Services.
Ralph Meijer <ralphm@ik.nu>
parents: 26
diff changeset
135 ("tcp:%s:%s" % (config["rhost"], config["rport"])))
ddc08757ec1d Fire up several component.IServices that match the backend Services.
Ralph Meijer <ralphm@ik.nu>
parents: 26
diff changeset
136
76
66fac7cd9edc Added -v (--verbose) flag to print out all traffic.
Ralph Meijer <ralphm@ik.nu>
parents: 75
diff changeset
137 if config["verbose"]:
66fac7cd9edc Added -v (--verbose) flag to print out all traffic.
Ralph Meijer <ralphm@ik.nu>
parents: 75
diff changeset
138 LogService().setServiceParent(sm)
66fac7cd9edc Added -v (--verbose) flag to print out all traffic.
Ralph Meijer <ralphm@ik.nu>
parents: 75
diff changeset
139
42
7d088c61e131 Make choice of backend an option to mktap. This includes the database
Ralph Meijer <ralphm@ik.nu>
parents: 35
diff changeset
140 if config['backend'] == 'pgsql':
109
9fb8f0867d02 Use storage.
Ralph Meijer <ralphm@ik.nu>
parents: 105
diff changeset
141 import pgsql_storage
9fb8f0867d02 Use storage.
Ralph Meijer <ralphm@ik.nu>
parents: 105
diff changeset
142 st = pgsql_storage.Storage(user=config['dbuser'],
9fb8f0867d02 Use storage.
Ralph Meijer <ralphm@ik.nu>
parents: 105
diff changeset
143 database=config['dbname'])
42
7d088c61e131 Make choice of backend an option to mktap. This includes the database
Ralph Meijer <ralphm@ik.nu>
parents: 35
diff changeset
144 elif config['backend'] == 'memory':
109
9fb8f0867d02 Use storage.
Ralph Meijer <ralphm@ik.nu>
parents: 105
diff changeset
145 import memory_storage
9fb8f0867d02 Use storage.
Ralph Meijer <ralphm@ik.nu>
parents: 105
diff changeset
146 st = memory_storage.Storage()
42
7d088c61e131 Make choice of backend an option to mktap. This includes the database
Ralph Meijer <ralphm@ik.nu>
parents: 35
diff changeset
147
109
9fb8f0867d02 Use storage.
Ralph Meijer <ralphm@ik.nu>
parents: 105
diff changeset
148 import generic_backend as b
43
9685b7e291ef Moved common stuff out of pgsql_backend.py to backend.py.
Ralph Meijer <ralphm@ik.nu>
parents: 42
diff changeset
149 bs = b.BackendService(st)
1
4cc41776b7d7 Initial revision
Ralph Meijer <ralphm@ik.nu>
parents:
diff changeset
150
97
cf918d581da5 Enable admin to hide all nodes when the service is queried using disco items.
Ralph Meijer <ralphm@ik.nu>
parents: 92
diff changeset
151 c = component.IService(bs)
cf918d581da5 Enable admin to hide all nodes when the service is queried using disco items.
Ralph Meijer <ralphm@ik.nu>
parents: 92
diff changeset
152 c.setServiceParent(sm)
cf918d581da5 Enable admin to hide all nodes when the service is queried using disco items.
Ralph Meijer <ralphm@ik.nu>
parents: 92
diff changeset
153 c.hide_nodes = config["hide-nodes"]
32
ddc08757ec1d Fire up several component.IServices that match the backend Services.
Ralph Meijer <ralphm@ik.nu>
parents: 26
diff changeset
154
ddc08757ec1d Fire up several component.IServices that match the backend Services.
Ralph Meijer <ralphm@ik.nu>
parents: 26
diff changeset
155 bsc = b.PublishService()
ddc08757ec1d Fire up several component.IServices that match the backend Services.
Ralph Meijer <ralphm@ik.nu>
parents: 26
diff changeset
156 bsc.setServiceParent(bs)
ddc08757ec1d Fire up several component.IServices that match the backend Services.
Ralph Meijer <ralphm@ik.nu>
parents: 26
diff changeset
157 component.IService(bsc).setServiceParent(sm)
ddc08757ec1d Fire up several component.IServices that match the backend Services.
Ralph Meijer <ralphm@ik.nu>
parents: 26
diff changeset
158
ddc08757ec1d Fire up several component.IServices that match the backend Services.
Ralph Meijer <ralphm@ik.nu>
parents: 26
diff changeset
159 bsc = b.NotificationService()
ddc08757ec1d Fire up several component.IServices that match the backend Services.
Ralph Meijer <ralphm@ik.nu>
parents: 26
diff changeset
160 bsc.setServiceParent(bs)
ddc08757ec1d Fire up several component.IServices that match the backend Services.
Ralph Meijer <ralphm@ik.nu>
parents: 26
diff changeset
161 component.IService(bsc).setServiceParent(sm)
1
4cc41776b7d7 Initial revision
Ralph Meijer <ralphm@ik.nu>
parents:
diff changeset
162
52
0947b46c0968 Use ISubscriptionService support of PostgreSQL backend.
Ralph Meijer <ralphm@ik.nu>
parents: 43
diff changeset
163 bsc = b.SubscriptionService()
0947b46c0968 Use ISubscriptionService support of PostgreSQL backend.
Ralph Meijer <ralphm@ik.nu>
parents: 43
diff changeset
164 bsc.setServiceParent(bs)
0947b46c0968 Use ISubscriptionService support of PostgreSQL backend.
Ralph Meijer <ralphm@ik.nu>
parents: 43
diff changeset
165 component.IService(bsc).setServiceParent(sm)
0947b46c0968 Use ISubscriptionService support of PostgreSQL backend.
Ralph Meijer <ralphm@ik.nu>
parents: 43
diff changeset
166
57
445a61f872b6 Use NodeCreationService for pgsql backend, too.
Ralph Meijer <ralphm@ik.nu>
parents: 52
diff changeset
167 bsc = b.NodeCreationService()
445a61f872b6 Use NodeCreationService for pgsql backend, too.
Ralph Meijer <ralphm@ik.nu>
parents: 52
diff changeset
168 bsc.setServiceParent(bs)
445a61f872b6 Use NodeCreationService for pgsql backend, too.
Ralph Meijer <ralphm@ik.nu>
parents: 52
diff changeset
169 component.IService(bsc).setServiceParent(sm)
32
ddc08757ec1d Fire up several component.IServices that match the backend Services.
Ralph Meijer <ralphm@ik.nu>
parents: 26
diff changeset
170
75
1f7b8b6b8ce9 Enable AffiliationsService for memory backend, too.
Ralph Meijer <ralphm@ik.nu>
parents: 73
diff changeset
171 bsc = b.AffiliationsService()
1f7b8b6b8ce9 Enable AffiliationsService for memory backend, too.
Ralph Meijer <ralphm@ik.nu>
parents: 73
diff changeset
172 bsc.setServiceParent(bs)
1f7b8b6b8ce9 Enable AffiliationsService for memory backend, too.
Ralph Meijer <ralphm@ik.nu>
parents: 73
diff changeset
173 component.IService(bsc).setServiceParent(sm)
63
60e95c60252d Setup AffiliationsService and matching protocol adapter for the pgsql
Ralph Meijer <ralphm@ik.nu>
parents: 57
diff changeset
174
109
9fb8f0867d02 Use storage.
Ralph Meijer <ralphm@ik.nu>
parents: 105
diff changeset
175 bsc = b.ItemRetrievalService()
9fb8f0867d02 Use storage.
Ralph Meijer <ralphm@ik.nu>
parents: 105
diff changeset
176 bsc.setServiceParent(bs)
9fb8f0867d02 Use storage.
Ralph Meijer <ralphm@ik.nu>
parents: 105
diff changeset
177 component.IService(bsc).setServiceParent(sm)
82
758cb81b97ce Enable ItemRetrievalService for pgsql backend.
Ralph Meijer <ralphm@ik.nu>
parents: 78
diff changeset
178
109
9fb8f0867d02 Use storage.
Ralph Meijer <ralphm@ik.nu>
parents: 105
diff changeset
179 bsc = b.RetractionService()
9fb8f0867d02 Use storage.
Ralph Meijer <ralphm@ik.nu>
parents: 105
diff changeset
180 bsc.setServiceParent(bs)
9fb8f0867d02 Use storage.
Ralph Meijer <ralphm@ik.nu>
parents: 105
diff changeset
181 component.IService(bsc).setServiceParent(sm)
85
ec557449d1aa Implement node retraction, with storage support for pgsql.
Ralph Meijer <ralphm@ik.nu>
parents: 82
diff changeset
182
109
9fb8f0867d02 Use storage.
Ralph Meijer <ralphm@ik.nu>
parents: 105
diff changeset
183 bsc = b.NodeDeletionService()
9fb8f0867d02 Use storage.
Ralph Meijer <ralphm@ik.nu>
parents: 105
diff changeset
184 bsc.setServiceParent(bs)
9fb8f0867d02 Use storage.
Ralph Meijer <ralphm@ik.nu>
parents: 105
diff changeset
185 component.IService(bsc).setServiceParent(sm)
91
47ee5369c410 Use NodeDeletionService for the pgsql backend.
Ralph Meijer <ralphm@ik.nu>
parents: 89
diff changeset
186
32
ddc08757ec1d Fire up several component.IServices that match the backend Services.
Ralph Meijer <ralphm@ik.nu>
parents: 26
diff changeset
187 s = IdavollService()
ddc08757ec1d Fire up several component.IServices that match the backend Services.
Ralph Meijer <ralphm@ik.nu>
parents: 26
diff changeset
188 s.setServiceParent(sm)
1
4cc41776b7d7 Initial revision
Ralph Meijer <ralphm@ik.nu>
parents:
diff changeset
189
32
ddc08757ec1d Fire up several component.IServices that match the backend Services.
Ralph Meijer <ralphm@ik.nu>
parents: 26
diff changeset
190 sm.setServiceParent(serviceCollection)
1
4cc41776b7d7 Initial revision
Ralph Meijer <ralphm@ik.nu>
parents:
diff changeset
191
32
ddc08757ec1d Fire up several component.IServices that match the backend Services.
Ralph Meijer <ralphm@ik.nu>
parents: 26
diff changeset
192 # other stuff
ddc08757ec1d Fire up several component.IServices that match the backend Services.
Ralph Meijer <ralphm@ik.nu>
parents: 26
diff changeset
193
ddc08757ec1d Fire up several component.IServices that match the backend Services.
Ralph Meijer <ralphm@ik.nu>
parents: 26
diff changeset
194 return sm