← Back to branch summary

~graphite-dev/graphite/1.1

« back to all changes in this revision

Viewing changes to carbon/lib/carbon/service.py

  • Committer: Chris Davis
  • Date: 2011-08-08 03:32:25 UTC
  • mfrom: (337.5.115 trunk)
  • Revision ID: chrismd@gmail.com-20110808033225-oncjaxk2pvd6651m
cherrypicking trunk revs 450-460

Show diffs side-by-side

added added

removed removed

Lines of Context:
carbon/lib/carbon/service.py
77
77
                            interface=settings.MANHOLE_INTERFACE)
78
78
        service.setServiceParent(root_service)
79
79
 
80
 
    # have to import this *after* settings are defined
81
 
    from carbon.writer import WriterService
82
 
 
83
 
    service = WriterService()
84
 
    service.setServiceParent(root_service)
85
 
 
86
80
    # Instantiate an instrumentation service that will record metrics about
87
81
    # this service.
88
82
    from carbon.instrumentation import InstrumentationService