equal
deleted
inserted
replaced
25 |
25 |
26 from sqlalchemy import create_engine, pool |
26 from sqlalchemy import create_engine, pool |
27 |
27 |
28 from .model import setEngine, setPool |
28 from .model import setEngine, setPool |
29 from .controller.pool import startPool, dbPool |
29 from .controller.pool import startPool, dbPool |
30 from .view import xmlrpc |
30 from .view import xmlrpc, jsonrpc |
31 from . import config |
31 from . import config |
32 |
32 |
33 def runReactor(reactor, engine, port, root): |
33 def runReactor(reactor, engine, port, root): |
34 """start reactor. |
34 """start reactor. |
35 |
35 |
54 engine = create_engine(config.main.dburl, |
54 engine = create_engine(config.main.dburl, |
55 poolclass = pool.SingletonThreadPool, pool_size=dbPool.maxthreads, ) |
55 poolclass = pool.SingletonThreadPool, pool_size=dbPool.maxthreads, ) |
56 |
56 |
57 |
57 |
58 root = resource.Resource() |
58 root = resource.Resource() |
59 root = xmlrpc.appendResource(root) |
59 xmlrpc.appendResource(root) |
|
60 jsonrpc.appendResource(root) |
60 |
61 |
61 v2 = resource.Resource() |
62 v2 = resource.Resource() |
62 v2 = xmlrpc.appendResource(root) |
63 xmlrpc.appendResource(v2) |
63 root.putChild('2.0', v2) |
64 jsonrpc.pappendResource(v2) |
|
65 root.putChild('1.0a', v2) |
64 |
66 |
65 runReactor(reactor, engine, config.main.port, root) |
67 runReactor(reactor, engine, config.main.port, root) |