← Back to branch summary

~0x44/nova/bug838466

« back to all changes in this revision

Viewing changes to bin/nova-compute

  • Committer: Todd Willey
  • Date: 2010-07-15 04:21:17 UTC
  • mfrom: (131.1.4)
  • Revision ID: git-v1:fb2ea2cafd67fc1ef67edc969a1edf3a1d2fd7f7
fix merge errors

Show diffs side-by-side

added added

removed removed

Lines of Context:
bin/nova-compute
75
75
            topic='%s.%s' % (FLAGS.compute_topic, FLAGS.node_name),
76
76
            proxy=n)
77
77
 
78
 
    pulse = task.LoopingCall(n.report_state, FLAGS.node_name, 'nova-compute')
 
78
    bin_name = os.path.basename(__file__)
 
79
    pulse = task.LoopingCall(n.report_state, FLAGS.node_name, bin_name)
79
80
    pulse.start(interval=FLAGS.node_report_state_interval, now=False)
80
81
 
81
82
    injected = consumer_all.attach_to_twisted()
83
84
 
84
85
    # This is the parent service that twistd will be looking for when it
85
86
    # parses this file, return it so that we can get it into globals below
86
 
    application = service.Application('nova-compute')
 
87
    application = service.Application(bin_name)
87
88
    n.setServiceParent(application)
88
89
    return application
89
90