From: Robert Ancell Date: Mon, 20 Jun 2016 02:24:57 +0000 (+1200) Subject: Remove display_server_get_name and make better logging prefixes X-Git-Url: https://rtime.felk.cvut.cz/gitweb/sojka/lightdm.git/commitdiff_plain/1f51f5bd700b69354b26e5800dea895120eed963 Remove display_server_get_name and make better logging prefixes --- diff --git a/src/display-server.c b/src/display-server.c index fb919ebe..37afe58a 100644 --- a/src/display-server.c +++ b/src/display-server.c @@ -22,9 +22,6 @@ static guint signals[LAST_SIGNAL] = { 0 }; struct DisplayServerPrivate { - /* Unique name for this display server */ - gchar *name; - /* TRUE when started */ gboolean is_ready; @@ -38,23 +35,7 @@ struct DisplayServerPrivate static void display_server_logger_iface_init (LoggerInterface *iface); G_DEFINE_TYPE_WITH_CODE (DisplayServer, display_server, G_TYPE_OBJECT, - G_IMPLEMENT_INTERFACE ( - LOGGER_TYPE, display_server_logger_iface_init)); - -void -display_server_set_name (DisplayServer *server, const gchar *name) -{ - g_return_if_fail (server != NULL); - g_free (server->priv->name); - server->priv->name = g_strdup (name); -} - -const gchar * -display_server_get_name (DisplayServer *server) -{ - g_return_val_if_fail (server != NULL, NULL); - return server->priv->name; -} + G_IMPLEMENT_INTERFACE (LOGGER_TYPE, display_server_logger_iface_init)); const gchar * display_server_get_session_type (DisplayServer *server) @@ -174,21 +155,9 @@ display_server_init (DisplayServer *server) server->priv = G_TYPE_INSTANCE_GET_PRIVATE (server, DISPLAY_SERVER_TYPE, DisplayServerPrivate); } -static void -display_server_finalize (GObject *object) -{ - DisplayServer *self = DISPLAY_SERVER (object); - - g_free (self->priv->name); - - G_OBJECT_CLASS (display_server_parent_class)->finalize (object); -} - static void display_server_class_init (DisplayServerClass *klass) { - GObjectClass *object_class = G_OBJECT_CLASS (klass); - klass->get_parent = display_server_real_get_parent; klass->get_can_share = display_server_real_get_can_share; klass->get_vt = display_server_real_get_vt; @@ -196,7 +165,6 @@ display_server_class_init (DisplayServerClass *klass) klass->connect_session = display_server_real_connect_session; klass->disconnect_session = display_server_real_disconnect_session; klass->stop = display_server_real_stop; - object_class->finalize = display_server_finalize; g_type_class_add_private (klass, sizeof (DisplayServerPrivate)); @@ -221,12 +189,7 @@ display_server_class_init (DisplayServerClass *klass) static gint display_server_real_logprefix (Logger *self, gchar *buf, gulong buflen) { - DisplayServer *server = DISPLAY_SERVER (self); - const gchar *name = display_server_get_name (server); - if (name) - return g_snprintf (buf, buflen, "DisplayServer %s: ", name); - else - return g_snprintf (buf, buflen, "DisplayServer: "); + return g_snprintf (buf, buflen, "DisplayServer: "); } static void diff --git a/src/display-server.h b/src/display-server.h index 7a85321d..08eb7b4e 100644 --- a/src/display-server.h +++ b/src/display-server.h @@ -56,10 +56,6 @@ typedef struct GType display_server_get_type (void); -void display_server_set_name (DisplayServer *server, const gchar *name); - -const gchar *display_server_get_name (DisplayServer *server); - const gchar *display_server_get_session_type (DisplayServer *server); DisplayServer *display_server_get_parent (DisplayServer *server); diff --git a/src/unity-system-compositor.c b/src/unity-system-compositor.c index c3fa5d40..83eacbac 100644 --- a/src/unity-system-compositor.c +++ b/src/unity-system-compositor.c @@ -64,7 +64,10 @@ struct UnitySystemCompositorPrivate int next_greeter_id; }; -G_DEFINE_TYPE (UnitySystemCompositor, unity_system_compositor, DISPLAY_SERVER_TYPE); +static void unity_system_compositor_logger_iface_init (LoggerInterface *iface); + +G_DEFINE_TYPE_WITH_CODE (UnitySystemCompositor, unity_system_compositor, DISPLAY_SERVER_TYPE, + G_IMPLEMENT_INTERFACE (LOGGER_TYPE, unity_system_compositor_logger_iface_init)); typedef enum { @@ -530,3 +533,15 @@ unity_system_compositor_class_init (UnitySystemCompositorClass *klass) g_type_class_add_private (klass, sizeof (UnitySystemCompositorPrivate)); } + +static gint +unity_system_compositor_real_logprefix (Logger *self, gchar *buf, gulong buflen) +{ + return g_snprintf (buf, buflen, "Unity System Compositor: "); +} + +static void +unity_system_compositor_logger_iface_init (LoggerInterface *iface) +{ + iface->logprefix = &unity_system_compositor_real_logprefix; +} diff --git a/src/x-server-local.c b/src/x-server-local.c index ce850fef..f2518237 100644 --- a/src/x-server-local.c +++ b/src/x-server-local.c @@ -68,7 +68,10 @@ struct XServerLocalPrivate gchar *background; }; -G_DEFINE_TYPE (XServerLocal, x_server_local, X_SERVER_TYPE); +static void x_server_local_logger_iface_init (LoggerInterface *iface); + +G_DEFINE_TYPE_WITH_CODE (XServerLocal, x_server_local, X_SERVER_TYPE, + G_IMPLEMENT_INTERFACE (LOGGER_TYPE, x_server_local_logger_iface_init)); static gchar *version = NULL; static guint version_major = 0, version_minor = 0; @@ -199,16 +202,7 @@ x_server_local_release_display_number (guint display_number) XServerLocal * x_server_local_new (void) { - XServerLocal *self; - gchar *name; - - self = g_object_new (X_SERVER_LOCAL_TYPE, NULL); - - name = g_strdup_printf ("x-%d", x_server_get_display_number (X_SERVER (self))); - display_server_set_name (DISPLAY_SERVER (self), name); - g_free (name); - - return self; + return g_object_new (X_SERVER_LOCAL_TYPE, NULL); } void @@ -473,7 +467,7 @@ x_server_local_start (DisplayServer *display_server) g_signal_connect (server->priv->x_server_process, PROCESS_SIGNAL_STOPPED, G_CALLBACK (stopped_cb), server); /* Setup logging */ - filename = g_strdup_printf ("%s.log", display_server_get_name (display_server)); + filename = g_strdup_printf ("x-%d.log", x_server_get_display_number (X_SERVER (server))); dir = config_get_string (config_get_instance (), "LightDM", "log-directory"); log_file = g_build_filename (dir, filename, NULL); backup_logs = config_get_boolean (config_get_instance (), "LightDM", "backup-logs"); @@ -630,3 +624,16 @@ x_server_local_class_init (XServerLocalClass *klass) g_type_class_add_private (klass, sizeof (XServerLocalPrivate)); } + +static gint +x_server_local_real_logprefix (Logger *self, gchar *buf, gulong buflen) +{ + XServerLocal *server = X_SERVER_LOCAL (self); + return g_snprintf (buf, buflen, "XServer %d: ", server->priv->display_number); +} + +static void +x_server_local_logger_iface_init (LoggerInterface *iface) +{ + iface->logprefix = &x_server_local_real_logprefix; +} diff --git a/src/x-server-remote.c b/src/x-server-remote.c index 1f458b15..1c12fcd5 100644 --- a/src/x-server-remote.c +++ b/src/x-server-remote.c @@ -24,19 +24,14 @@ G_DEFINE_TYPE (XServerRemote, x_server_remote, X_SERVER_TYPE); XServerRemote * x_server_remote_new (const gchar *hostname, guint number, XAuthority *authority) { - XServerRemote *self = g_object_new (X_SERVER_REMOTE_TYPE, NULL); - gchar *name; + XServerRemote *server = g_object_new (X_SERVER_REMOTE_TYPE, NULL); - self->priv->display_number = number; + server->priv->display_number = number; - x_server_set_hostname (X_SERVER (self), hostname); - x_server_set_authority (X_SERVER (self), authority); + x_server_set_hostname (X_SERVER (server), hostname); + x_server_set_authority (X_SERVER (server), authority); - name = g_strdup_printf ("x-%s-%d", hostname, number); - display_server_set_name (DISPLAY_SERVER (self), name); - g_free (name); - - return self; + return server; } static guint diff --git a/src/x-server-xmir.c b/src/x-server-xmir.c index c8759ed6..fac57362 100644 --- a/src/x-server-xmir.c +++ b/src/x-server-xmir.c @@ -53,18 +53,12 @@ XServerXmir * x_server_xmir_new (UnitySystemCompositor *compositor) { XServerXmir *server; - gchar *name; server = g_object_new (X_SERVER_XMIR_TYPE, NULL); x_server_local_set_command (X_SERVER_LOCAL (server), "Xmir"); server->priv->compositor = g_object_ref (compositor); g_signal_connect (compositor, DISPLAY_SERVER_SIGNAL_READY, G_CALLBACK (compositor_ready_cb), server); g_signal_connect (compositor, DISPLAY_SERVER_SIGNAL_STOPPED, G_CALLBACK (compositor_stopped_cb), server); - - name = g_strdup_printf ("x-%d", x_server_get_display_number (X_SERVER (server))); - display_server_set_name (DISPLAY_SERVER (server), name); - g_free (name); - return server; } diff --git a/src/x-server-xvnc.c b/src/x-server-xvnc.c index 1abbff3c..95e1d7f0 100644 --- a/src/x-server-xvnc.c +++ b/src/x-server-xvnc.c @@ -34,16 +34,11 @@ G_DEFINE_TYPE (XServerXVNC, x_server_xvnc, X_SERVER_LOCAL_TYPE); XServerXVNC * x_server_xvnc_new (void) { - XServerXVNC *self = g_object_new (X_SERVER_XVNC_TYPE, NULL); - gchar *name; + XServerXVNC *server = g_object_new (X_SERVER_XVNC_TYPE, NULL); - name = g_strdup_printf ("xvnc-%d", x_server_get_display_number (X_SERVER (self))); - display_server_set_name (DISPLAY_SERVER (self), name); - g_free (name); - - x_server_local_set_command (X_SERVER_LOCAL (self), "Xvnc"); + x_server_local_set_command (X_SERVER_LOCAL (server), "Xvnc"); - return self; + return server; } void x_server_xvnc_set_socket (XServerXVNC *server, int fd)