From c4f52fc84f447e4cc201a6bef14b7def45199cfe Mon Sep 17 00:00:00 2001 From: Andrea Zagli Date: Thu, 21 Aug 2014 11:14:43 +0200 Subject: [PATCH] Aggiunta la classe per la gestione dei log. --- .cproject | 55 +++++++------- src/Makefile.am | 2 + src/log.c | 186 ++++++++++++++++++++++++++++++++++++++++++++++ src/log.h | 63 ++++++++++++++++ tests/Makefile.am | 1 + tests/log.c | 71 ++++++++++++++++++ 6 files changed, 352 insertions(+), 26 deletions(-) create mode 100644 src/log.c create mode 100644 src/log.h create mode 100644 tests/log.c diff --git a/.cproject b/.cproject index 69cecb5..6b2f1fb 100644 --- a/.cproject +++ b/.cproject @@ -1,42 +1,41 @@ - - - + - - + + - - + + - - - - - - - - + + + + + diff --git a/src/Makefile.am b/src/Makefile.am index 1905935..a178933 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -32,6 +32,7 @@ lib_LTLIBRARIES = libsolipa.la \ libsolipa_la_SOURCES = solipa.c \ allegato.c \ camelsession.c \ + log.c \ mail.c \ mailui.c \ progresswindow.c \ @@ -43,6 +44,7 @@ libsolipa_include_HEADERS = libsolipa.h \ solipa.h \ allegato.h \ camelsession.h \ + log.h \ mail.h \ mailui.h \ progresswindow.h \ diff --git a/src/log.c b/src/log.c new file mode 100644 index 0000000..578d3f7 --- /dev/null +++ b/src/log.c @@ -0,0 +1,186 @@ +/* + * Copyright (C) 2014 Andrea Zagli + * + * 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 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 + * Lesser General Public License for more details. + * + * 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 Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifdef HAVE_CONFIG_H + #include +#endif + +#include + +#include "log.h" + +static void solipa_log_class_init (SolipaLogClass *class); +static void solipa_log_init (SolipaLog *solipa_log); + +static void solipa_log_set_property (GObject *object, + guint property_id, + const GValue *value, + GParamSpec *pspec); +static void solipa_log_get_property (GObject *object, + guint property_id, + GValue *value, + GParamSpec *pspec); + +static void solipa_log_handler (const gchar *log_domain, + GLogLevelFlags log_level, + const gchar *message, + gpointer user_data); + +#define SOLIPA_LOG_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), TYPE_SOLIPA_LOG, SolipaLogPrivate)) + +typedef struct _SolipaLogPrivate SolipaLogPrivate; +struct _SolipaLogPrivate + { + Solipa *solipa; + + gchar *app_name; + gchar *dir; + }; + +G_DEFINE_TYPE (SolipaLog, solipa_log, G_TYPE_OBJECT) + +static void +solipa_log_class_init (SolipaLogClass *class) +{ + GObjectClass *object_class = G_OBJECT_CLASS (class); + + object_class->set_property = solipa_log_set_property; + object_class->get_property = solipa_log_get_property; + + g_type_class_add_private (object_class, sizeof (SolipaLogPrivate)); +} + +static void +solipa_log_init (SolipaLog *solipa_log) +{ + SolipaLogPrivate *priv = SOLIPA_LOG_GET_PRIVATE (solipa_log); +} + +/** + * solipa_log_new: + * @solipa: + * @app_name: + * + * Returns: the newly created #SolipaLog object. + */ +SolipaLog +*solipa_log_new (Solipa *solipa, const gchar *app_name) +{ + SolipaLog *solipa_log; + SolipaLogPrivate *priv; + + gchar *_app_name; + + g_return_val_if_fail (IS_SOLIPA (solipa), NULL); + g_return_val_if_fail (app_name != NULL, NULL); + + _app_name = g_strdup (app_name); + g_strstrip(_app_name); + g_return_val_if_fail (g_strcmp0 (_app_name, "") != 0, NULL); + + solipa_log = SOLIPA_LOG (g_object_new (solipa_log_get_type (), NULL)); + + priv = SOLIPA_LOG_GET_PRIVATE (solipa_log); + + priv->solipa = solipa; + priv->app_name = g_strdup (_app_name); + g_free (_app_name); + + priv->dir = g_build_filename (g_get_user_data_dir (), g_strdup_printf ("solipa_log_%s", priv->app_name), NULL); + if (g_mkdir_with_parents (priv->dir, S_IRWXU) < 0) + { + g_warning ("SolipaLog: unable to create log directory."); + g_free (priv->app_name); + g_free (priv->dir); + return NULL; + } + + return solipa_log; +} + +void +solipa_log_add_logdomain (SolipaLog *solipalog, const gchar *log_domain) +{ + g_return_if_fail (IS_SOLIPA_LOG (solipalog)); + + g_log_set_handler (g_strcmp0 (log_domain, "") == 0 ? NULL : log_domain, + G_LOG_LEVEL_MASK, + solipa_log_handler, NULL); +} + +void +solipa_log_add_logdomains (SolipaLog *solipalog, ...) +{ + va_list vargs; + + gchar *log_domain; + + g_return_if_fail (IS_SOLIPA_LOG (solipalog)); + + va_start (vargs, solipalog); + while ((log_domain = va_arg (vargs, gchar *)) != NULL) + { + solipa_log_add_logdomain (solipalog, log_domain); + } + + va_end (vargs); +} + +/* PRIVATE */ +static void +solipa_log_set_property (GObject *object, + guint property_id, + const GValue *value, + GParamSpec *pspec) +{ + SolipaLog *solipa_log = (SolipaLog *)object; + SolipaLogPrivate *priv = SOLIPA_LOG_GET_PRIVATE (solipa_log); + + switch (property_id) + { + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); + break; + } +} + +static void +solipa_log_get_property (GObject *object, + guint property_id, + GValue *value, + GParamSpec *pspec) +{ + SolipaLog *solipa_log = (SolipaLog *)object; + SolipaLogPrivate *priv = SOLIPA_LOG_GET_PRIVATE (solipa_log); + + switch (property_id) + { + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); + break; + } +} + +static void +solipa_log_handler (const gchar *log_domain, + GLogLevelFlags log_level, + const gchar *message, + gpointer user_data) +{ + g_printf ("solipa_log: (%d) %s - %s\n", log_level, log_domain, message); +} diff --git a/src/log.h b/src/log.h new file mode 100644 index 0000000..2d793a7 --- /dev/null +++ b/src/log.h @@ -0,0 +1,63 @@ +/* + * Copyright (C) 2014 Andrea Zagli + * + * 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 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 + * Lesser General Public License for more details. + * + * 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 Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifndef __SOLIPA_LOG_H__ +#define __SOLIPA_LOG_H__ + +#include +#include + +#include "solipa.h" + + +G_BEGIN_DECLS + + +#define TYPE_SOLIPA_LOG (solipa_log_get_type ()) +#define SOLIPA_LOG(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_SOLIPA_LOG, SolipaLog)) +#define SOLIPA_LOG_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_SOLIPA_LOG, SolipaLogClass)) +#define IS_SOLIPA_LOG(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_SOLIPA_LOG)) +#define IS_SOLIPA_LOG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_SOLIPA_LOG)) +#define SOLIPA_LOG_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_SOLIPA_LOG, SolipaLogClass)) + +typedef struct _SolipaLog SolipaLog; +typedef struct _SolipaLogClass SolipaLogClass; + +struct _SolipaLog + { + GObject parent; + }; + +struct _SolipaLogClass + { + GObjectClass parent_class; + }; + +GType solipa_log_get_type (void) G_GNUC_CONST; + + +SolipaLog *solipa_log_new (Solipa *solipa, const gchar *app_name); + +void solipa_log_add_logdomain (SolipaLog *solipalog, const gchar *log_domain); +void solipa_log_add_logdomains (SolipaLog *solipalog, ...); + + +G_END_DECLS + + +#endif /* __SOLIPA_LOG_H__ */ diff --git a/tests/Makefile.am b/tests/Makefile.am index 66e5bbc..7fa5182 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -14,6 +14,7 @@ LDADD = $(top_builddir)/src/libsolipa.la ooo_LDADD = $(top_builddir)/src/libsolipaooo.la noinst_PROGRAMS = allegato \ + log \ mail \ mail_check_address \ mail_get_addresses_from_string \ diff --git a/tests/log.c b/tests/log.c new file mode 100644 index 0000000..e1f86dc --- /dev/null +++ b/tests/log.c @@ -0,0 +1,71 @@ +/* + * Copyright (C) 2014 Andrea Zagli + * + * 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 program 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 this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ + +#include +#include + +#include +#include + +int +main (int argc, char **argv) +{ + Solipa *solipa; + SolipaLog *solipalog; + + GError *error; + GdaConnection *connection; + GdaSqlParser *parser; + GdaStatement *stmt; + GdaDataModel *dm; + + gda_init (); + + dm = NULL; + + solipa = solipa_new (); + + solipalog = solipa_log_new (solipa, "test_log"); + + solipa_log_add_logdomains (solipalog, "", "GLib-GObject", "Solipa", NULL); + + error = NULL; + connection = gda_connection_open_from_string ("PostgreSQL", + "DB_NAME=pippo", + NULL, + GDA_CONNECTION_OPTIONS_READ_ONLY, + &error); + + if (error != NULL) + { + g_warning ("%s", error->message != NULL ? error->message : "nessun dettaglio"); + } + + parser = gda_sql_parser_new (); + stmt = gda_sql_parser_parse_string (parser, "SELECT * FROM customers WHERE id=1000", NULL, NULL); + dm = gda_connection_statement_execute_select (connection, stmt, NULL, NULL); + + gda_connection_close (connection); + + g_object_unref (dm); + g_object_unref (stmt); + g_object_unref (parser); + g_object_unref (connection); + + return 0; +} -- 2.49.0