Merge lp:~ted/upstart/flip-edges into lp:upstart

[Ted Gould]

Flip edges to fix Graphviz rankings

Change the edges of the Graphviz graph so that Graphviz can figure out the rankings of the various items and generate a better diagram.

[Dimitri John Ledkov (xnox)]

Indeed the new diagram is much better. It now displays upstart view of proactive triggering of jobs left-to-right.

review: Approve

=== modified file 'scripts/initctl2dot.py'
--- scripts/initctl2dot.py	2013-03-22 13:50:30 +0000
+++ scripts/initctl2dot.py	2013-06-28 20:19:25 +0000
@@ -264,23 +264,23 @@
 
 
 def show_start_on_job_edge(ofh, from_job, to_job):
-    show_edge(ofh, "%s:start" % mk_job_node_name(from_job),
-              "%s:job" % mk_job_node_name(to_job), options.color_start_on)
+    show_edge(ofh, "%s:job" % mk_job_node_name(to_job),
+              "%s:start" % mk_job_node_name(from_job), options.color_start_on)
 
 
 def show_start_on_event_edge(ofh, from_job, to_event):
-    show_edge(ofh, "%s:start" % mk_job_node_name(from_job),
-              mk_event_node_name(to_event), options.color_start_on)
+    show_edge(ofh, mk_event_node_name(to_event),
+              "%s:start" % mk_job_node_name(from_job), options.color_start_on)
 
 
 def show_stop_on_job_edge(ofh, from_job, to_job):
-    show_edge(ofh, "%s:stop" % mk_job_node_name(from_job),
-              "%s:job" % mk_job_node_name(to_job), options.color_stop_on)
+    show_edge(ofh, "%s:job" % mk_job_node_name(to_job),
+              "%s:stop" % mk_job_node_name(from_job), options.color_stop_on)
 
 
 def show_stop_on_event_edge(ofh, from_job, to_event):
-    show_edge(ofh, "%s:stop" % mk_job_node_name(from_job),
-              mk_event_node_name(to_event), options.color_stop_on)
+    show_edge(ofh, mk_event_node_name(to_event),
+              "%s:stop" % mk_job_node_name(from_job), options.color_stop_on)
 
 
 def show_job_emits_edge(ofh, from_job, to_event):