X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=systemctl.vala;h=821be5a4f86e665114e8a65915d055e4a4759ec0;hp=4f017e02e7a0a82baca3ceec6596556a5ca6373c;hb=c1b94fda55e6e29e388a30f846b62650b5e60f7e;hpb=edddf4ff8841951cdbb698f72a3f4f8554ce8d33 diff --git a/systemctl.vala b/systemctl.vala index 4f017e02e..821be5a4f 100644 --- a/systemctl.vala +++ b/systemctl.vala @@ -24,6 +24,7 @@ static string type = null; static bool all = false; static bool replace = false; static bool session = false; +static Connection bus = null; public static int job_info_compare(void* key1, void* key2) { Manager.JobInfo *j1 = (Manager.JobInfo*) key1; @@ -43,12 +44,40 @@ public static int unit_info_compare(void* key1, void* key2) { return Posix.strcmp(u1->id, u2->id); } +public void on_unit_changed(Unit u) { + stdout.printf("Unit %s changed.\n", u.id); +} + public void on_unit_new(string id, ObjectPath path) { stdout.printf("Unit %s added.\n", id); + + Unit u = bus.get_object( + "org.freedesktop.systemd1", + path, + "org.freedesktop.systemd1.Unit") as Unit; + + u.changed += on_unit_changed; + + /* FIXME: We leak memory here */ + u.ref(); +} + +public void on_job_changed(Job j) { + stdout.printf("Job %u changed.\n", j.id); } public void on_job_new(uint32 id, ObjectPath path) { stdout.printf("Job %u added.\n", id); + + Job j = bus.get_object( + "org.freedesktop.systemd1", + path, + "org.freedesktop.systemd1.Job") as Job; + + j.changed += on_job_changed; + + /* FIXME: We leak memory here */ + j.ref(); } public void on_unit_removed(string id, ObjectPath path) { @@ -70,20 +99,28 @@ static const OptionEntry entries[] = { int main (string[] args) { - OptionContext context = new OptionContext("[OPTION...] [COMMAND [ARGUMENT...]]"); + OptionContext context = new OptionContext("[COMMAND [ARGUMENT...]]"); context.add_main_entries(entries, null); context.set_description( "Commands:\n" + - " list-units List units\n" + - " list-jobs List jobs\n" + - " clear-jobs Cancel all jobs\n" + - " load [NAME...] Load one or more units\n" + - " cancel [JOB...] Cancel one or more jobs\n" + - " start [NAME...] Start on or more units\n" + - " stop [NAME...] Stop on or more units\n" + - " restart [NAME...] Restart on or more units\n" + - " reload [NAME...] Reload on or more units\n" + - " monitor Monitor unit/job changes\n"); + " list-units List units\n" + + " list-jobs List jobs\n" + + " clear-jobs Cancel all jobs\n" + + " load [NAME...] Load one or more units\n" + + " cancel [JOB...] Cancel one or more jobs\n" + + " start [NAME...] Start on or more units\n" + + " stop [NAME...] Stop on or more units\n" + + " enter [NAME] Start one unit and stop all others\n" + + " restart [NAME...] Restart on or more units\n" + + " reload [NAME...] Reload on or more units\n" + + " monitor Monitor unit/job changes\n" + + " dump Dump server status\n" + + " snapshot [NAME] Create a snapshot\n" + + " daemon-reload Reload daemon configuration\n" + + " daemon-reexecute Reexecute daemon\n" + + " show-environment Dump environment\n" + + " set-environment [NAME=VALUE...] Set one or more environment variables\n" + + " unset-environment [NAME...] Unset one or more environment variables\n"); try { context.parse(ref args); @@ -92,19 +129,19 @@ int main (string[] args) { } try { - Connection bus = Bus.get(session ? BusType.SESSION : BusType.SYSTEM); + bus = Bus.get(session ? BusType.SESSION : BusType.SYSTEM); Manager manager = bus.get_object ( "org.freedesktop.systemd1", "/org/freedesktop/systemd1", - "org.freedesktop.systemd1") as Manager; + "org.freedesktop.systemd1.Manager") as Manager; if (args[1] == "list-units" || args.length <= 1) { var list = manager.list_units(); uint n = 0; Posix.qsort(list, list.length, sizeof(Manager.UnitInfo), unit_info_compare); - stdout.printf("%-45s %-6s %-12s %-17s\n", "UNIT", "LOAD", "ACTIVE", "JOB"); + stdout.printf("%-45s %-6s %-12s %-12s %-17s\n", "UNIT", "LOAD", "ACTIVE", "SUB", "JOB"); foreach (var i in list) { @@ -114,10 +151,10 @@ int main (string[] args) { if (!all && i.active_state == "inactive") continue; - stdout.printf("%-45s %-6s %-12s", i.id, i.load_state, i.active_state); + stdout.printf("%-45s %-6s %-12s %-12s", i.id, i.load_state, i.active_state, i.sub_state); if (i.job_id != 0) - stdout.printf("→ %-15s", i.job_type); + stdout.printf(" -> %-15s", i.job_type); stdout.puts("\n"); n++; @@ -191,7 +228,7 @@ int main (string[] args) { for (int i = 2; i < args.length; i++) { - ObjectPath p = manager.get_unit(args[i]); + ObjectPath p = manager.load_unit(args[i]); Unit u = bus.get_object( "org.freedesktop.systemd1", @@ -210,6 +247,22 @@ int main (string[] args) { u.reload(mode); } + } else if (args[1] == "isolate") { + + if (args.length != 3) { + stderr.printf("Missing argument.\n"); + return 1; + } + + ObjectPath p = manager.load_unit(args[2]); + + Unit u = bus.get_object( + "org.freedesktop.systemd1", + p, + "org.freedesktop.systemd1.Unit") as Unit; + + u.start("isolate"); + } else if (args[1] == "monitor") { manager.subscribe(); @@ -222,7 +275,40 @@ int main (string[] args) { MainLoop l = new MainLoop(); l.run(); - } else { + } else if (args[1] == "dump") + stdout.puts(manager.dump()); + + else if (args[1] == "snapshot") { + + ObjectPath p = manager.create_snapshot(args.length > 2 ? args[2] : ""); + + Unit u = bus.get_object( + "org.freedesktop.systemd1", + p, + "org.freedesktop.systemd1.Unit") as Unit; + + stdout.printf("%s\n", u.id); + + } else if (args[1] == "daemon-reload") + manager.reload(); + + else if (args[1] == "daemon-reexecute" || args[1] == "daemon-reexec") + manager.reexecute(); + + else if (args[1] == "daemon-exit") + manager.exit(); + + else if (args[1] == "show-environment") { + foreach(var x in manager.environment) + stderr.printf("%s\n", x); + + } else if (args[1] == "set-environment") + manager.set_environment(args[2:args.length]); + + else if (args[1] == "unset-environment") + manager.unset_environment(args[2:args.length]); + + else { stderr.printf("Unknown command %s.\n", args[1]); return 1; }