From: Andrea Zagli Date: Tue, 2 Sep 2014 11:15:24 +0000 (+0200) Subject: SolipaLog: aggiunta la rotazione di più file. X-Git-Url: https://saetta.ns0.it/gitweb?a=commitdiff_plain;h=48b7939f47fc8c33af82825b22fa11232fc13c6c;p=solipa%2Flibsolipa SolipaLog: aggiunta la rotazione di più file. --- diff --git a/.cproject b/.cproject index 6b2f1fb..8efd6bf 100644 --- a/.cproject +++ b/.cproject @@ -1,41 +1,38 @@ - - + + + - - + + - - - - - - - - - + - - - - + + + + + + diff --git a/src/log.c b/src/log.c index bd11cea..82584be 100644 --- a/src/log.c +++ b/src/log.c @@ -282,6 +282,23 @@ solipa_log_create_file (SolipaLog *solipalog) return TRUE; } +static gint +solipa_log_sort_filename (gconstpointer a, + gconstpointer b) +{ + const gchar *namea; + const gchar *nameb; + + namea = g_file_info_get_name ((GFileInfo *)a); + nameb = g_file_info_get_name ((GFileInfo *)b); + + /* la ordino al contrario */ + /* TODO + * l'ordinamento deve essere non alphanumerico normale ma tenendo conto del numero del file + */ + return (-1 * g_strcmp0 (namea, nameb)); +} + static void solipa_log_handler (const gchar *log_domain, GLogLevelFlags log_level, @@ -332,109 +349,220 @@ solipa_log_handler (const gchar *log_domain, { if (priv->rotation_rotate > 0) { - GFile *fold; + GFile *fdir; + GFile *fold; - fold = g_file_new_for_path (g_build_filename (g_file_get_path (g_file_get_parent (priv->file)), g_strdup_printf ("%s.0", priv->filename), NULL)); - g_file_delete (fold, NULL, NULL); - g_object_unref (fold); + /* leggo la directory e ordino i file */ + GFileEnumerator *enumdir; - g_output_stream_close (G_OUTPUT_STREAM (priv->stream), NULL, NULL); - - fold = g_file_set_display_name (priv->file, g_strdup_printf ("%s.0", priv->filename), NULL, NULL); - g_object_unref (priv->file); - priv->file = g_object_ref (fold); - g_object_unref (fold); - - if (priv->compress) - { - GZlibCompressor *compress; - GOutputStream *ostreamcomp; - GFile *fout; - GFileInputStream *istream; - GFileOutputStream *ostream; + fdir = g_file_get_parent (priv->file); error = NULL; - istream = g_file_read (priv->file, NULL, &error); - if (istream == NULL || error != NULL) + enumdir = g_file_enumerate_children (fdir, + G_FILE_ATTRIBUTE_STANDARD_NAME, + G_FILE_QUERY_INFO_NONE, + NULL, + &error); + if (enumdir == NULL || error != NULL) { - g_warning ("Impossibile leggere dal file %s: %s.", - g_strdup_printf ("%s.0", priv->filename), - error != NULL && error->message != NULL ? error->message : "nessun dettaglio"); + g_warning ("Impossibile leggere la directory dei log: %s.", + error != NULL && error->message != NULL ? error->message : "nessun dettaglio"); } - - buf = g_malloc0 (size); - - error = NULL; - if (!g_input_stream_read_all (G_INPUT_STREAM (istream), - buf, - size, - NULL, - NULL, - &error)) - { - g_warning ("Impossibile leggere dallo stream: %s.", - error != NULL && error->message != NULL ? error->message : "nessun dettaglio"); - } - - fout = g_file_new_for_path (g_build_filename (g_file_get_path (g_file_get_parent (priv->file)), g_strdup_printf ("%s.0.gz", priv->filename), NULL)); - error = NULL; - ostream = g_file_replace (fout, - NULL, - FALSE, - G_FILE_CREATE_PRIVATE, - NULL, - &error); - if (ostream == NULL || error != NULL) + else { - g_warning ("Impossibile creare il file: %s.", - error != NULL && error->message != NULL ? error->message : "nessun dettaglio"); + GFileInfo *finfodir; + GSList *lstdir; + guint lstdir_size; + const gchar *filename; + + GRegex *regex; + GMatchInfo *minfo; + gchar *numero; + gchar *str; + + lstdir = NULL; + lstdir_size = 0; + while ((finfodir = g_file_enumerator_next_file (enumdir, NULL, NULL)) != NULL) + { + /* TODO + * deve includere solo i file che corrispondono alla regex + */ + lstdir_size++; + lstdir = g_slist_prepend (lstdir, g_object_ref (finfodir)); + } + g_file_enumerator_close (enumdir, NULL, NULL); + + if (lstdir != NULL) + { + /* ordino la lista al contrario */ + lstdir = g_slist_sort (lstdir, solipa_log_sort_filename); + } + + error = NULL; + regex = g_regex_new (g_strdup_printf ("(%s\\.)(\\d+)(.*)", priv->filename), 0, 0, &error); + if (regex == NULL || error != NULL) + { + g_warning ("Error on creating regex: %s.", + error->message != NULL ? error->message : "no details"); + } + else + { + do + { + finfodir = (GFileInfo *)lstdir->data; + filename = g_file_info_get_name (finfodir); + + if (g_regex_match ((const GRegex *)regex, + filename, + 0, + &minfo)) + { + fold = g_file_new_for_path (g_build_filename (g_file_get_path (fdir), filename, NULL)); + if (lstdir_size >= priv->rotation_rotate) + { + /* elimino il file */ + g_file_delete (fold, NULL, NULL); + lstdir_size--; + } + else + { + /* rinomino i file */ + numero = g_match_info_fetch (minfo, 2); + + error = NULL; + str = g_regex_replace ((const GRegex *)regex, + filename, + -1, + 0, + g_strdup_printf ("\\g<1>%d\\g<3>", strtol (numero, NULL, 10) + 1), + 0, + &error); + if (error != NULL) + { + g_warning ("Error on regex replacing: %s.", + error->message != NULL ? error->message : "no details"); + g_regex_unref (regex); + } + + g_file_set_display_name (fold, str, NULL, NULL); + + g_object_unref (fold); + + g_free (str); + g_free (numero); + g_match_info_free (minfo); + } + } + } while ((lstdir = g_slist_next (lstdir)) != NULL); + } + if (regex != NULL) + { + g_regex_unref (regex); + } + + fold = g_file_new_for_path (g_build_filename (g_file_get_path (fdir), g_strdup_printf ("%s.0", priv->filename), NULL)); + g_file_delete (fold, NULL, NULL); + g_object_unref (fold); + + g_output_stream_close (G_OUTPUT_STREAM (priv->stream), NULL, NULL); + + fold = g_file_set_display_name (priv->file, g_strdup_printf ("%s.0", priv->filename), NULL, NULL); + g_object_unref (priv->file); + priv->file = g_object_ref (fold); + g_object_unref (fold); + + if (priv->compress) + { + GZlibCompressor *compress; + GOutputStream *ostreamcomp; + GFile *fout; + GFileInputStream *istream; + GFileOutputStream *ostream; + + error = NULL; + istream = g_file_read (priv->file, NULL, &error); + if (istream == NULL || error != NULL) + { + g_warning ("Impossibile leggere dal file %s: %s.", + g_strdup_printf ("%s.0", priv->filename), + error != NULL && error->message != NULL ? error->message : "nessun dettaglio"); + } + + buf = g_malloc0 (size); + + error = NULL; + if (!g_input_stream_read_all (G_INPUT_STREAM (istream), + buf, + size, + NULL, + NULL, + &error)) + { + g_warning ("Impossibile leggere dallo stream: %s.", + error != NULL && error->message != NULL ? error->message : "nessun dettaglio"); + } + + fout = g_file_new_for_path (g_build_filename (g_file_get_path (g_file_get_parent (priv->file)), g_strdup_printf ("%s.0.gz", priv->filename), NULL)); + error = NULL; + ostream = g_file_replace (fout, + NULL, + FALSE, + G_FILE_CREATE_PRIVATE, + NULL, + &error); + if (ostream == NULL || error != NULL) + { + g_warning ("Impossibile creare il file: %s.", + error != NULL && error->message != NULL ? error->message : "nessun dettaglio"); + } + + compress = g_zlib_compressor_new (G_ZLIB_COMPRESSOR_FORMAT_GZIP, + -1); + ostreamcomp = g_converter_output_stream_new (G_OUTPUT_STREAM (ostream), + G_CONVERTER (compress)); + + error = NULL; + if (!g_output_stream_write_all (ostreamcomp, + buf, + size, + NULL, + NULL, + &error)) + { + g_warning ("Impossibile creare il file: %s.", + error != NULL && error->message != NULL ? error->message : "nessun dettaglio"); + } + + if (istream != NULL) + { + g_input_stream_close (G_INPUT_STREAM (istream), NULL, NULL); + g_object_unref (istream); + } + if (ostreamcomp != NULL) + { + g_output_stream_close (ostreamcomp, NULL, NULL); + g_object_unref (ostreamcomp); + } + if (ostream != NULL) + { + g_output_stream_close (G_OUTPUT_STREAM (ostream), NULL, NULL); + g_object_unref (ostream); + } + + g_free (buf); + + g_object_unref (fout); + + g_file_delete (priv->file, NULL, NULL); + } + + g_object_unref (priv->file); } - - compress = g_zlib_compressor_new (G_ZLIB_COMPRESSOR_FORMAT_GZIP, - -1); - ostreamcomp = g_converter_output_stream_new (G_OUTPUT_STREAM (ostream), - G_CONVERTER (compress)); - - error = NULL; - if (!g_output_stream_write_all (ostreamcomp, - buf, - size, - NULL, - NULL, - &error)) - { - g_warning ("Impossibile creare il file: %s.", - error != NULL && error->message != NULL ? error->message : "nessun dettaglio"); - } - - if (istream != NULL) - { - g_input_stream_close (G_INPUT_STREAM (istream), NULL, NULL); - g_object_unref (istream); - } - if (ostreamcomp != NULL) - { - g_output_stream_close (ostreamcomp, NULL, NULL); - g_object_unref (ostreamcomp); - } - if (ostream != NULL) - { - g_output_stream_close (G_OUTPUT_STREAM (ostream), NULL, NULL); - g_object_unref (ostream); - } - - g_free (buf); - - g_object_unref (fout); - - g_file_delete (priv->file, NULL, NULL); - } - - g_object_unref (priv->file); } else { /* semplicemente lo elimino e ricreo */ + g_output_stream_close (G_OUTPUT_STREAM (priv->stream), NULL, NULL); g_file_delete (priv->file, NULL, NULL); g_object_unref (priv->file); } diff --git a/tests/log.c b/tests/log.c index 5843113..00e3666 100644 --- a/tests/log.c +++ b/tests/log.c @@ -46,7 +46,9 @@ main (int argc, char **argv) solipa_log_add_logdomains (solipalog, "", "solipa_test_log", "GLib-GObject", "Solipa", NULL); - g_object_set (G_OBJECT (solipalog), "size", 800, NULL); + g_object_set (G_OBJECT (solipalog), + "size", 800, + NULL); error = NULL; connection = gda_connection_open_from_string ("PostgreSQL",