Changeset d4946efe30b6cc3d3b901c8ec150f9810c020490

Timestamp:

12/23/10 02:36:58 (2 years ago)

Author:

Nedko Arnaudov <nedko@…>

Children:

df4def70b2e17409817d2db70c5929d52cb489e7

Parents:

67ba277fa541fe5b84e61569febc36a2c72bc249

git-committer:

Nedko Arnaudov <nedko@arnaudov.name> / 2010-12-23T02:36:58Z+0200

Message:

gladish: Don't log dbus error when studio is not loaded on gladish start

Files:

• daemon/main.c (modified) (1 diff)
• dbus/helpers.c (modified) (3 diffs)
• dbus/helpers.h (modified) (1 diff)
• gui/dbus.c (modified) (1 diff)
• proxies/studio_proxy.c (modified) (1 diff)

daemon/main.c

@@ -190 +190 @@
   dbus_object_path_destroy(g_dbus_connection, g_control_object);
   dbus_connection_unref(g_dbus_connection);
+  dbus_call_last_error_cleanup();
 }
 

dbus/helpers.c

@@ -43 +43 @@
 DBusConnection * g_dbus_connection;
 DBusError g_dbus_error;
+static char * g_dbus_call_last_error_name;
+static char * g_dbus_call_last_error_message;
 
 struct dbus_signal_hook_descriptor
@@ -62 +64 @@
 
 LIST_HEAD(g_dbus_services);
+
+
+void dbus_call_last_error_cleanup(void)
+{
+  free(g_dbus_call_last_error_name);
+  g_dbus_call_last_error_name = NULL;
+
+  free(g_dbus_call_last_error_message);
+  g_dbus_call_last_error_message = NULL;
+}
+
+bool dbus_call_last_error_is_name(const char * name)
+{
+  return g_dbus_call_last_error_name != NULL && strcmp(name, g_dbus_call_last_error_name) == 0;
+}
+
+const char * dbus_call_last_error_get_message(void)
+{
+  return g_dbus_call_last_error_message != NULL ? g_dbus_call_last_error_message : "";
+}
+
+static void dbus_call_last_error_set(void)
+{
+  dbus_call_last_error_cleanup();
+
+  if (g_dbus_error.name != NULL)
+  {
+    g_dbus_call_last_error_name = strdup(g_dbus_error.name);
+  }
+
+  if (g_dbus_error.message != NULL)
+  {
+    g_dbus_call_last_error_message = strdup(g_dbus_error.message);
+  }
+}
 
 bool dbus_iter_get_dict_entry(DBusMessageIter * iter_ptr, const char * key, void * value, int * type, int * size)
@@ -354 +391 @@
   if (reply_ptr == NULL)
   {
-    //log_error("calling method '%s' failed, error is '%s'", method, g_dbus_error.message);
+    dbus_call_last_error_set();
     dbus_error_free(&g_dbus_error);
   }

dbus/helpers.h

@@ -112 +112 @@
   const char * service);
 
+void dbus_call_last_error_cleanup(void);
+bool dbus_call_last_error_is_name(const char * name);
+const char * dbus_call_last_error_get_message(void);
+
 #include "method.h"
 #include "signal.h"

gui/dbus.c

@@ -56 +56 @@
     dbus_error_free(&g_dbus_error);
   }
+
+  dbus_call_last_error_cleanup();
 }

proxies/studio_proxy.c

@@ -299 +299 @@
   if (!dbus_call(0, SERVICE_NAME, STUDIO_OBJECT_PATH, IFACE_STUDIO, "GetRoomList", "", NULL, &reply_ptr))
   {
-    log_error("Cannot fetch studio room list");
+    /* Don't log error if there is no studio loaded */
+    if (!dbus_call_last_error_is_name(DBUS_ERROR_UNKNOWN_METHOD))
+    {
+      log_error("Cannot fetch studio room list: %s", dbus_call_last_error_get_message());
+    }
+
     return;
   }