X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=systemctl.vala;h=4f017e02e7a0a82baca3ceec6596556a5ca6373c;hp=cbde75dc7ff5a5d418d562290c673662cfa58b49;hb=edddf4ff8841951cdbb698f72a3f4f8554ce8d33;hpb=911081dde7ec28b28bfed7e08ab901158c18712d

diff --git a/systemctl.vala b/systemctl.vala
index cbde75dc7..4f017e02e 100644
--- a/systemctl.vala
+++ b/systemctl.vala
@@ -1,9 +1,29 @@
+/***
+  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 <http://www.gnu.org/licenses/>.
+***/
+
 using DBus;
 using GLib;
 
 static string type = null;
 static bool all = false;
 static bool replace = false;
+static bool session = false;
 
 public static int job_info_compare(void* key1, void* key2) {
         Manager.JobInfo *j1 = (Manager.JobInfo*) key1;
@@ -23,17 +43,47 @@ public static int unit_info_compare(void* key1, void* key2) {
         return Posix.strcmp(u1->id, u2->id);
 }
 
+public void on_unit_new(string id, ObjectPath path) {
+        stdout.printf("Unit %s added.\n", id);
+}
+
+public void on_job_new(uint32 id, ObjectPath path) {
+        stdout.printf("Job %u added.\n", id);
+}
+
+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("[OPTION...] [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");
 
         try {
                 context.parse(ref args);
@@ -42,7 +92,7 @@ int main (string[] args) {
         }
 
         try {
-                Connection bus = Bus.get(BusType.SESSION);
+                Connection bus = Bus.get(session ? BusType.SESSION : BusType.SYSTEM);
 
                 Manager manager = bus.get_object (
                                 "org.freedesktop.systemd1",
@@ -101,7 +151,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 +161,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,7 +189,7 @@ 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]);
 
@@ -160,6 +210,18 @@ int main (string[] args) {
                                         u.reload(mode);
                         }
 
+                } 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 {
                         stderr.printf("Unknown command %s.\n", args[1]);
                         return 1;