← Back to branch summary

~launchpad-pqm/launchpad/devel

« back to all changes in this revision

Viewing changes to daemons/librarian.tac

  • Committer: William Grant
  • Date: 2011-12-30 01:48:17 UTC
  • mto: (14606.3.6 apocaremains)
  • mto: This revision was merged to the branch mainline in revision 14608.
  • Revision ID: william.grant@canonical.com-20111230014817-7qmddxz1x941socp
Move the rest of canonical.librarian to lp.services.librarianserver.

Show diffs side-by-side

added added

removed removed

Lines of Context:
daemons/librarian.tac
8
8
import signal
9
9
 
10
10
from meliae import scanner
11
 
 
12
 
from twisted.application import service, strports
 
11
from twisted.application import (
 
12
    service,
 
13
    strports,
 
14
    )
13
15
from twisted.internet import reactor
14
16
from twisted.python import log
15
17
from twisted.scripts.twistd import ServerOptions
16
18
from twisted.web import server
17
19
 
18
 
from lp.services.config import config, dbconfig
 
20
from lp.services.config import (
 
21
    config,
 
22
    dbconfig,
 
23
    )
19
24
from lp.services.daemons import readyservice
 
25
from lp.services.librarian.interfaces.client import (
 
26
    DUMP_FILE,
 
27
    SIGDUMPMEM,
 
28
    )
 
29
from lp.services.librarianserver import (
 
30
    db,
 
31
    storage,
 
32
    web as fatweb,
 
33
    )
 
34
from lp.services.librarianserver.libraryprotocol import FileUploadFactory
20
35
from lp.services.scripts import execute_zcml_for_scripts
21
 
 
22
 
from canonical.librarian.libraryprotocol import FileUploadFactory
23
 
from canonical.librarian import storage, db
24
 
from canonical.librarian import web as fatweb
25
 
from lp.services.librarian.interfaces.client import DUMP_FILE, SIGDUMPMEM
26
36
from lp.services.twistedsupport.loggingsupport import set_up_oops_reporting
27
37
 
28
38
# Connect to database