-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
+/* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2; -*- */
/*
- * Copyright (C) 2006-2007 Imendio AB
+ * Copyright (C) 2007 Collabora Ltd.
+ * Copyright (C) 2007 Nokia Corporation
*
- * This program 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.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
*
- * This program is distributed in the hope that it will be useful,
+ * This library 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.
+ * Lesser General Public License for more details.
*
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Authors: Richard Hult <richard@imendio.com>
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include "config.h"
+#include "empathy-debug.h"
-#include <stdarg.h>
-#include <string.h>
-#include <unistd.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <errno.h>
+#include <tp-account-widgets/tpaw-debug.h>
+
+#ifdef ENABLE_DEBUG
+
+static EmpathyDebugFlags flags = 0;
+
+static GDebugKey keys[] = {
+ { "Tp", EMPATHY_DEBUG_TP },
+ { "Chat", EMPATHY_DEBUG_CHAT },
+ { "Contact", EMPATHY_DEBUG_CONTACT },
+ { "Account", EMPATHY_DEBUG_ACCOUNT },
+ { "Dispatcher", EMPATHY_DEBUG_DISPATCHER },
+ { "Ft", EMPATHY_DEBUG_FT },
+ { "Location", EMPATHY_DEBUG_LOCATION },
+ { "Other", EMPATHY_DEBUG_OTHER },
+ { "Connectivity", EMPATHY_DEBUG_CONNECTIVITY },
+ { "ImportMc4Accounts", EMPATHY_DEBUG_IMPORT_MC4_ACCOUNTS },
+ { "Tests", EMPATHY_DEBUG_TESTS },
+ { "Voip", EMPATHY_DEBUG_VOIP },
+ { "Tls", EMPATHY_DEBUG_TLS },
+ { "Sasl", EMPATHY_DEBUG_SASL },
+ { "Camera", EMPATHY_DEBUG_CAMERA },
+ { 0, }
+};
-#include <glib.h>
-#include <glib/gprintf.h>
-#include <glib/gstdio.h>
+static void
+debug_set_flags (EmpathyDebugFlags new_flags)
+{
+ flags |= new_flags;
+}
-#include <telepathy-glib/debug.h>
+void
+empathy_debug_set_flags (const gchar *flags_string)
+{
+ guint nkeys;
-/* Set EMPATHY_DEBUG to a colon/comma/space separated list of domains, or "all"
- * to get all debug output.
- */
+ for (nkeys = 0; keys[nkeys].value; nkeys++);
-#include "empathy-debug.h"
+ tp_debug_set_flags (flags_string);
+ tpaw_debug_set_flags (flags_string);
-static gchar **debug_strv;
-static gboolean all_domains = FALSE;
+ if (flags_string)
+ debug_set_flags (g_parse_debug_string (flags_string, keys, nkeys));
+}
+
+gboolean
+empathy_debug_flag_is_set (EmpathyDebugFlags flag)
+{
+ return (flag & flags) != 0;
+}
+
+GHashTable *flag_to_keys = NULL;
+
+static const gchar *
+debug_flag_to_key (EmpathyDebugFlags flag)
+{
+ if (flag_to_keys == NULL)
+ {
+ guint i;
+
+ flag_to_keys = g_hash_table_new_full (g_direct_hash, g_direct_equal,
+ NULL, g_free);
+
+ for (i = 0; keys[i].value; i++)
+ {
+ GDebugKey key = (GDebugKey) keys[i];
+ g_hash_table_insert (flag_to_keys, GUINT_TO_POINTER (key.value),
+ g_strdup (key.key));
+ }
+ }
+
+ return g_hash_table_lookup (flag_to_keys, GUINT_TO_POINTER (flag));
+}
+
+void
+empathy_debug_free (void)
+{
+ if (flag_to_keys == NULL)
+ return;
+
+ g_hash_table_unref (flag_to_keys);
+ flag_to_keys = NULL;
+}
static void
-debug_init (void)
+log_to_debug_sender (EmpathyDebugFlags flag,
+ const gchar *message)
{
- static gboolean inited = FALSE;
+ TpDebugSender *sender;
+ gchar *domain;
+ GTimeVal now;
- if (!inited) {
- const gchar *env;
- gint i;
+ sender = tp_debug_sender_dup ();
- env = g_getenv ("EMPATHY_DEBUG");
- tp_debug_set_flags (env);
+ g_get_current_time (&now);
- if (env) {
- debug_strv = g_strsplit_set (env, ":, ", 0);
- } else {
- debug_strv = NULL;
- }
+ domain = g_strdup_printf ("%s/%s", G_LOG_DOMAIN, debug_flag_to_key (flag));
- for (i = 0; debug_strv && debug_strv[i]; i++) {
- if (strcmp ("all", debug_strv[i]) == 0) {
- all_domains = TRUE;
- }
- }
+ tp_debug_sender_add_message (sender, &now, domain, G_LOG_LEVEL_DEBUG, message);
- inited = TRUE;
- }
+ g_free (domain);
+ g_object_unref (sender);
}
void
-empathy_debug_impl (const gchar *domain, const gchar *msg, ...)
+empathy_debug (EmpathyDebugFlags flag,
+ const gchar *format,
+ ...)
{
- gint i;
+ gchar *message;
+ va_list args;
- g_return_if_fail (domain != NULL);
- g_return_if_fail (msg != NULL);
+ va_start (args, format);
+ message = g_strdup_vprintf (format, args);
+ va_end (args);
- debug_init ();
+ log_to_debug_sender (flag, message);
- for (i = 0; debug_strv && debug_strv[i]; i++) {
- if (all_domains || strcmp (domain, debug_strv[i]) == 0) {
- va_list args;
+ if (flag & flags)
+ g_log (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, "%s", message);
- g_print ("%s: ", domain);
+ g_free (message);
+}
- va_start (args, msg);
- g_vprintf (msg, args);
- va_end (args);
+#else
- g_print ("\n");
- break;
- }
- }
+gboolean
+empathy_debug_flag_is_set (EmpathyDebugFlags flag)
+{
+ return FALSE;
}
void
-empathy_debug_set_log_file_from_env (void)
+empathy_debug (EmpathyDebugFlags flag, const gchar *format, ...)
{
- const gchar *output_file;
- gint out;
-
- output_file = g_getenv ("EMPATHY_LOGFILE");
- if (output_file == NULL) {
- return;
- }
-
- out = g_open (output_file, O_WRONLY | O_CREAT, 0644);
- if (out == -1) {
- g_warning ("Can't open logfile '%s': %s", output_file,
- g_strerror (errno));
- return;
- }
-
- if (dup2 (out, STDOUT_FILENO) == -1) {
- g_warning ("Error when duplicating stdout file descriptor: %s",
- g_strerror (errno));
- return;
- }
-
- if (dup2 (out, STDERR_FILENO) == -1) {
- g_warning ("Error when duplicating stderr file descriptor: %s",
- g_strerror (errno));
- return;
- }
}
+void
+empathy_debug_set_flags (const gchar *flags_string)
+{
+}
+
+#endif /* ENABLE_DEBUG */
+
projects / empathy.git / blobdiff