X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=systemctl.vala;h=821be5a4f86e665114e8a65915d055e4a4759ec0;hp=cbde75dc7ff5a5d418d562290c673662cfa58b49;hb=c1b94fda55e6e29e388a30f846b62650b5e60f7e;hpb=501c7d0b77607fe858911b1c94070b63b6cc221e diff --git a/systemctl.vala b/systemctl.vala index cbde75dc7..821be5a4f 100644 --- a/systemctl.vala +++ b/systemctl.vala @@ -1,9 +1,30 @@ +/*** + This file is part of systemd. + + Copyright 2010 Lennart Poettering + + systemd is free software; you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + systemd is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + General Public License for more details. + + You should have received a copy of the GNU General Public License + along with systemd; If not, see . +***/ + using DBus; using GLib; 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; @@ -23,17 +44,83 @@ 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) { + stdout.printf("Unit %s removed.\n", id); +} + +public void on_job_removed(uint32 id, ObjectPath path) { + stdout.printf("Job %u removed.\n", id); +} + static const OptionEntry entries[] = { - { "type", 't', 0, OptionArg.STRING, out type, "List only particular type of units", "TYPE" }, - { "all", 'a', 0, OptionArg.NONE, out all, "Show all units, including dead ones", null }, - { "replace", 0, 0, OptionArg.NONE, out replace, "When installing a new job, replace existing conflicting ones.", null }, + { "type", 't', 0, OptionArg.STRING, out type, "List only particular type of units", "TYPE" }, + { "all", 'a', 0, OptionArg.NONE, out all, "Show all units, including dead ones", null }, + { "replace", 0, 0, OptionArg.NONE, out replace, "When installing a new job, replace existing conflicting ones", null }, + { "session", 0, 0, OptionArg.NONE, out session, "Connect to session bus", null }, + { "system", 0, OptionFlags.REVERSE, OptionArg.NONE, out session, "Connect to system bus", null }, { null } }; int main (string[] args) { - OptionContext context = new OptionContext(" -- Control systemd"); + 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" + + " 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); @@ -42,19 +129,19 @@ int main (string[] args) { } try { - Connection bus = Bus.get(BusType.SESSION); + 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) { @@ -64,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++; @@ -101,7 +188,7 @@ int main (string[] args) { return 1; } - for (uint i = 2; i < args.length; i++) + for (int i = 2; i < args.length; i++) manager.load_unit(args[i]); } else if (args[1] == "cancel") { @@ -111,7 +198,7 @@ int main (string[] args) { return 1; } - for (uint i = 2; i < args.length; i++) { + for (int i = 2; i < args.length; i++) { uint32 id; if (args[i].scanf("%u", out id) != 1) { @@ -139,9 +226,9 @@ int main (string[] args) { return 1; } - for (uint i = 2; i < args.length; i++) { + 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", @@ -160,7 +247,68 @@ int main (string[] args) { u.reload(mode); } - } else { + } 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(); + + manager.unit_new += on_unit_new; + manager.unit_removed += on_unit_removed; + manager.job_new += on_job_new; + manager.job_removed += on_job_removed; + + MainLoop l = new MainLoop(); + l.run(); + + } 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; }