Merge lp:~xnox/upstart/no-classes into lp:upstart

[Dimitri John Ledkov]

[lp:~xnox/upstart/no-classes]

1666. By Dimitri John Ledkov on 2015-01-10

Make udev-bridge suitable for user sessions.

1667. By Dimitri John Ledkov on 2015-01-11

upstart-event-bridge makes no-sense on the system init.

1668. By Dimitri John Ledkov on 2015-01-11

Implement user pidfile handling, and skip syslog for user daemon.

Unmerged revisions

1668. By Dimitri John Ledkov on 2015-01-11

Implement user pidfile handling, and skip syslog for user daemon.

1667. By Dimitri John Ledkov on 2015-01-11

upstart-event-bridge makes no-sense on the system init.

1666. By Dimitri John Ledkov on 2015-01-10

Make udev-bridge suitable for user sessions.

1665. By Dimitri John Ledkov on 2015-01-09

upstart-local-bridge: drop unused job-class parsing code.

=== modified file 'extra/Makefile.am'
--- extra/Makefile.am	2013-10-31 18:19:46 +0000
+++ extra/Makefile.am	2015-01-11 01:45:53 +0000
@@ -23,6 +23,7 @@
 	conf-session/upstart-event-bridge.conf \
 	conf-session/upstart-file-bridge.conf \
 	conf-session/re-exec.conf \
+	conf-session/upstart-udev-bridge.conf \
 	conf-session/upstart-dbus-session-bridge.conf \
 	conf-session/upstart-dbus-system-bridge.conf
 
@@ -33,7 +34,6 @@
 
 dist_init_DATA = \
 	conf/upstart-socket-bridge.conf \
-	conf/upstart-event-bridge.conf \
 	conf/upstart-file-bridge.conf \
 	conf/upstart-dbus-bridge.conf
 
 
=== added file 'extra/conf-session/upstart-udev-bridge.conf'
--- extra/conf-session/upstart-udev-bridge.conf	1970-01-01 00:00:00 +0000
+++ extra/conf-session/upstart-udev-bridge.conf	2015-01-11 01:45:53 +0000
@@ -0,0 +1,22 @@
+# upstart-udev-bridge - Bridge udev events into session upstart
+#
+# This helper daemon receives udev events from the netlink socket and
+# emits equivalent Upstart events.
+
+description	"Bridge udev events into upstart"
+
+# From upstart-udev-bridge itself
+emits *-device-added
+emits *-device-removed
+emits *-device-changed
+# From http://www.kernel.org/pub/linux/utils/kernel/hotplug/libudev/libudev-udev-device.html
+emits *-device-online
+emits *-device-offline
+
+start on starting udev
+stop on stopped udev
+
+expect daemon
+respawn
+
+exec upstart-udev-bridge --daemon --user
 
=== removed file 'extra/conf/upstart-event-bridge.conf'
--- extra/conf/upstart-event-bridge.conf	2013-01-22 20:08:29 +0000
+++ extra/conf/upstart-event-bridge.conf	1970-01-01 00:00:00 +0000
@@ -1,15 +0,0 @@
-# upstart-event-bridge - Bridge system upstarts events into session upstart
-#
-# This helper daemon receives system upstart events from the DBus system bus
-# and emits equivalent events (with a :sys:) prefix to the session bus
-
-description	"Bridge Upstart system events into session Upstart"
-
-emits :sys:*
-
-start on started dbus
-stop on stopped dbus
-
-respawn
-
-exec upstart-event-bridge
 
=== modified file 'extra/upstart-local-bridge.c'
--- extra/upstart-local-bridge.c	2013-10-04 21:34:25 +0000
+++ extra/upstart-local-bridge.c	2015-01-11 01:45:53 +0000
@@ -48,21 +48,6 @@
 
 #include "dbus/upstart.h"
 #include "com.ubuntu.Upstart.h"
-#include "com.ubuntu.Upstart.Job.h"
-
-/**
- * Job:
- *
- * @entry: list header,
- * @path: D-Bus path for a job.
- *
- * Representation of an Upstart Job.
- *
- **/
-typedef struct job {
-	NihList entry;
-	char *path;
-} Job;
 
 /**
  * Socket:
@@ -100,10 +85,6 @@
 	struct ucred   ucred;
 } ClientConnection;
 
-static void upstart_job_added    (void *data, NihDBusMessage *message,
-				  const char *job);
-static void upstart_job_removed  (void *data, NihDBusMessage *message,
-				  const char *job);
 static void upstart_connect      (void);
 static void upstart_disconnected (DBusConnection *connection);
 
@@ -134,13 +115,6 @@
 static int daemonise = FALSE;
 
 /**
- * jobs:
- *
- * Jobs that we're monitoring.
- **/
-static NihHash *jobs = NULL;
-
-/**
  * upstart:
  *
  * Proxy to Upstart daemon.
@@ -273,9 +247,6 @@
 		exit (1);
 	}
 
-	/* Allocate jobs hash table */
-	jobs = NIH_MUST (nih_hash_string_new (NULL, 0));
-
 	sock = create_socket (NULL);
 	if (! sock) {
 		nih_fatal ("%s %s",
@@ -326,100 +297,11 @@
 	return ret;
 }
 
-static void
-upstart_job_added (void            *data,
-		   NihDBusMessage  *message,
-		   const char      *job_class_path)
-{
-	nih_local NihDBusProxy *job_class = NULL;
-	nih_local char ***start_on = NULL;
-	nih_local char ***stop_on = NULL;
-	Job *job;
-
-	nih_assert (job_class_path != NULL);
-
-	/* Obtain a proxy to the job */
-	job_class = nih_dbus_proxy_new (NULL, upstart->connection,
-					upstart->name, job_class_path,
-					NULL, NULL);
-	if (! job_class) {
-		NihError *err;
-
-		err = nih_error_get ();
-		nih_error ("Could not create proxy for job %s: %s",
-			   job_class_path, err->message);
-		nih_free (err);
-
-		return;
-	}
-
-	job_class->auto_start = FALSE;
-
-	/* Obtain the start_on and stop_on properties of the job */
-	if (job_class_get_start_on_sync (NULL, job_class, &start_on) < 0) {
-		NihError *err;
-
-		err = nih_error_get ();
-		nih_error ("Could not obtain job start condition %s: %s",
-			   job_class_path, err->message);
-		nih_free (err);
-
-		return;
-	}
-
-	if (job_class_get_stop_on_sync (NULL, job_class, &stop_on) < 0) {
-		NihError *err;
-
-		err = nih_error_get ();
-		nih_error ("Could not obtain job stop condition %s: %s",
-			   job_class_path, err->message);
-		nih_free (err);
-
-		return;
-	}
-
-	/* Free any existing record for the job (should never happen,
-	 * but worth being safe).
-	 */
-	job = (Job *)nih_hash_lookup (jobs, job_class_path);
-	if (job)
-		nih_free (job);
-
-	/* Create new record for the job */
-	job = NIH_MUST (nih_new (NULL, Job));
-	job->path = NIH_MUST (nih_strdup (job, job_class_path));
-
-	nih_list_init (&job->entry);
-
-	nih_debug ("Job got added %s", job_class_path);
-
-	nih_alloc_set_destructor (job, nih_list_destroy);
-
-	/* Add all jobs */
-	nih_hash_add (jobs, &job->entry);
-}
-
-static void
-upstart_job_removed (void            *data,
-		     NihDBusMessage  *message,
-		     const char      *job_path)
-{
-	Job *job;
-
-	nih_assert (job_path != NULL);
-
-	job = (Job *)nih_hash_lookup (jobs, job_path);
-	if (job) {
-		nih_debug ("Job went away %s", job_path);
-		nih_free (job);
-	}
-}
 
 static void
 upstart_connect (void)
 {
 	DBusConnection    *connection;
-	char            **job_class_paths;
 
 	/* Initialise the connection to Upstart */
 	connection = NIH_SHOULD (nih_dbus_connect (DBUS_ADDRESS_UPSTART, upstart_disconnected));
@@ -449,49 +331,6 @@
 	}
 
 	nih_debug ("Connected to Upstart");
-
-	/* Connect signals to be notified when jobs come and go */
-	if (! nih_dbus_proxy_connect (upstart, &upstart_com_ubuntu_Upstart0_6, "JobAdded",
-				      (NihDBusSignalHandler)upstart_job_added, NULL)) {
-		NihError *err;
-
-		err = nih_error_get ();
-		nih_fatal ("%s: %s", _("Could not create JobAdded signal connection"),
-			   err->message);
-		nih_free (err);
-
-		exit (1);
-	}
-
-	if (! nih_dbus_proxy_connect (upstart, &upstart_com_ubuntu_Upstart0_6, "JobRemoved",
-				      (NihDBusSignalHandler)upstart_job_removed, NULL)) {
-		NihError *err;
-
-		err = nih_error_get ();
-		nih_fatal ("%s: %s", _("Could not create JobRemoved signal connection"),
-			   err->message);
-		nih_free (err);
-
-		exit (1);
-	}
-
-	/* Request a list of all current jobs */
-	if (upstart_get_all_jobs_sync (NULL, upstart, &job_class_paths) < 0) {
-		NihError *err;
-
-		err = nih_error_get ();
-		nih_fatal ("%s: %s", _("Could not obtain job list"),
-			   err->message);
-		nih_free (err);
-
-		exit (1);
-	}
-
-	for (char **job_class_path = job_class_paths;
-	     job_class_path && *job_class_path; job_class_path++)
-		upstart_job_added (NULL, NULL, *job_class_path);
-
-	nih_free (job_class_paths);
 }
 
 static void
 
=== modified file 'extra/upstart-udev-bridge.c'
--- extra/upstart-udev-bridge.c	2011-12-15 16:14:06 +0000
+++ extra/upstart-udev-bridge.c	2015-01-11 01:45:53 +0000
@@ -69,6 +69,15 @@
 static NihDBusProxy *upstart = NULL;
 
 /**
+ * user:
+ *
+ * If TRUE, run in User Session mode connecting to the Session Init
+ * rather than PID 1. In this mode, certain relative paths are also
+ * expanded.
+ **/
+static int user = FALSE;
+
+/**
  * no_strip_udev_data:
  *
  * If TRUE, do not modify any udev message data (old behaviour).
@@ -86,6 +95,8 @@
 	  NULL, NULL, &daemonise, NULL },
 	{ 0, "no-strip", N_("Do not strip non-printable bytes from udev message data"),
 	  NULL, NULL, &no_strip_udev_data, NULL },
+	{ 0, "user", N_("Connect to user session"),
+	  NULL, NULL, &user, NULL },
 
 	NIH_OPTION_LAST
 };
@@ -97,6 +108,11 @@
 {
 	char **              args;
 	DBusConnection *     connection;
+	char *               pidfile_path = NULL;
+	char *               pidfile = NULL;
+	char                *user_session_addr = NULL;
+	nih_local char **    user_session_path = NULL;
+	char *               path_element = NULL;
 	struct udev *        udev;
 	struct udev_monitor *udev_monitor;
 	int                  ret;
@@ -113,8 +129,19 @@
 	if (! args)
 		exit (1);
 
+	if (user) {
+		user_session_addr = getenv ("UPSTART_SESSION");
+		if (! user_session_addr) {
+			nih_fatal (_("UPSTART_SESSION isn't set in environment"));
+			exit (EXIT_FAILURE);
+		}
+	}
+
 	/* Initialise the connection to Upstart */
-	connection = NIH_SHOULD (nih_dbus_connect (DBUS_ADDRESS_UPSTART, upstart_disconnected));
+	connection = NIH_SHOULD (nih_dbus_connect (user
+				? user_session_addr
+				: DBUS_ADDRESS_UPSTART,
+				upstart_disconnected));
 	if (! connection) {
 		NihError *err;
 
@@ -153,6 +180,35 @@
 
 	/* Become daemon */
 	if (daemonise) {
+		/* Deal with the pidfile location when becoming a daemon.
+		 * We need to be able to run one bridge per upstart daemon.
+		 * Store the PID file in XDG_RUNTIME_DIR or HOME and include the pid of
+		 * the Upstart instance (last part of the DBus path) in the filename.
+		 */
+
+		if (user) {
+			/* Extract PID from UPSTART_SESSION */
+			user_session_path = nih_str_split (NULL, user_session_addr, "/", TRUE);
+			
+			for (int i = 0; user_session_path && user_session_path[i]; i++)
+				path_element = user_session_path[i];
+
+			if (! path_element) {
+				nih_fatal (_("Invalid value for UPSTART_SESSION"));
+				exit (1);
+			}
+
+			pidfile_path = getenv ("XDG_RUNTIME_DIR");
+			if (!pidfile_path)
+				pidfile_path = getenv ("HOME");
+
+			if (pidfile_path) {
+				NIH_MUST (nih_strcat_sprintf (&pidfile, NULL, "%s/%s.%s.pid",
+							      pidfile_path, program_invocation_short_name, path_element));
+				nih_main_set_pidfile (pidfile);
+			}
+		}
+
 		if (nih_main_daemonise () < 0) {
 			NihError *err;
 
@@ -163,10 +219,12 @@
 
 			exit (1);
 		}
-
-		/* Send all logging output to syslog */
-		openlog (program_name, LOG_PID, LOG_DAEMON);
-		nih_log_set_logger (nih_logger_syslog);
+		
+		if (!user) {
+			/* Send all logging output to syslog for system bridge */
+			openlog (program_name, LOG_PID, LOG_DAEMON);
+			nih_log_set_logger (nih_logger_syslog);
+		}
 	}
 
 	/* Handle TERM and INT signals gracefully */