← Back to branch summary

~xnox/upstart/reload-signal

« back to all changes in this revision

Viewing changes to scripts/initctl2dot.py

  • Committer: James Hunt
  • Date: 2013-07-03 13:10:22 UTC
  • mfrom: (1498.2.1 starting-reversal)
  • Revision ID: james.hunt@ubuntu.com-20130703131022-udsufon0jb06k2fu
* Merge of lp:~ted/upstart/starting-reversal.

Show diffs side-by-side

added added

removed removed

Lines of Context:
scripts/initctl2dot.py
263
263
    ofh.write("  %s -> %s [color=\"%s\"];\n" % (from_node, to_node, color))
264
264
 
265
265
 
266
 
def show_start_on_job_edge(ofh, from_job, to_job):
267
 
    show_edge(ofh, "%s:job" % mk_job_node_name(to_job),
268
 
              "%s:start" % mk_job_node_name(from_job), options.color_start_on)
 
266
def show_start_on_job_edge(ofh, from_job, to_job, relation):
 
267
    if relation == 'starting':
 
268
        show_edge(ofh, "%s:start" % mk_job_node_name(from_job),
 
269
                  "%s:job" % mk_job_node_name(to_job),options.color_start_on)
 
270
    else:
 
271
        show_edge(ofh, "%s:job" % mk_job_node_name(to_job),
 
272
                  "%s:start" % mk_job_node_name(from_job), options.color_start_on)
269
273
 
270
274
 
271
275
def show_start_on_event_edge(ofh, from_job, to_event):
298
302
 
299
303
    for job in jobs_list:
300
304
        for s in jobs[job]['start on']['job']:
301
 
            show_start_on_job_edge(ofh, job, s)
 
305
            show_start_on_job_edge(ofh, job, s, jobs[job]['start on']['job'][s])
302
306
 
303
307
        for s in jobs[job]['start on']['event']:
304
308
            show_start_on_event_edge(ofh, job, s)
384
388
            _event = encode_dollar(job, result.group(1))
385
389
            _job = result.group(2)
386
390
            if _job:
387
 
                jobs[job]['start on']['job'][_job] = 1
 
391
                jobs[job]['start on']['job'][_job] = _event
388
392
            else:
389
393
                jobs[job]['start on']['event'][_event] = 1
390
394
                events[_event] = 1