Revert "trivial: Correctly truncate existing logfiles"

This reverts commit cefcad4027ada131d322ec578a8e32f3f5652240.

Revert "trivial: Fix a critical warning in the self tests"

This reverts commit 3e353879b9e24d3aa9a21d5ef0d295d26febafcd.

Revert "Write log files in a better way"

This reverts commit 342d570825ed01f11bef0d722baec1fa2801964b.

1 files changed, 34 insertions, 81 deletions

diff --git a/libappstream-builder/asb-package.c b/libappstream-builder/asb-package.c
index 7d70c26..c2cbf1b 100644
--- a/libappstream-builder/asb-package.c
+++ b/libappstream-builder/asb-package.c
@@ -29,12 +29,8 @@
 
 #include "config.h"
 
-#include <fcntl.h>
 #include <limits.h>
 
-#include <gio/gunixoutputstream.h>
-#include <glib/gstdio.h>
-
 #include "asb-package.h"
 #include "asb-plugin.h"
 
@@ -62,13 +58,14 @@ typedef struct
 	gchar		*vcs;
 	gchar		*source_nevra;
 	gchar		*source_pkgname;
-	GOutputStream	*output_stream;
-	GMutex		 output_stream_mutex;
+	gsize		 log_written_len;
+	GString		*log;
 	GHashTable	*configs;
 	GTimer		*timer;
 	gdouble		 last_log;
 	GPtrArray	*releases;
 	GHashTable	*releases_hash;
+	GMutex		 mutex_log;
 } AsbPackagePrivate;
 
 G_DEFINE_TYPE_WITH_PRIVATE (AsbPackage, asb_package, G_TYPE_OBJECT)
@@ -81,15 +78,7 @@ asb_package_finalize (GObject *object)
 	AsbPackage *pkg = ASB_PACKAGE (object);
 	AsbPackagePrivate *priv = GET_PRIVATE (pkg);
 
-	/* optional */
-	if (priv->output_stream != NULL) {
-		g_autoptr(GError) error = NULL;
-		if (!g_output_stream_close (priv->output_stream, NULL, &error))
-			g_warning ("failed to close stream: %s", error->message);
-		g_object_unref (priv->output_stream);
-	}
-
-	g_mutex_clear (&priv->output_stream_mutex);
+	g_mutex_clear (&priv->mutex_log);
 	g_strfreev (priv->filelist);
 	g_ptr_array_unref (priv->deps);
 	g_free (priv->filename);
@@ -106,6 +95,7 @@ asb_package_finalize (GObject *object)
 	g_free (priv->vcs);
 	g_free (priv->source_nevra);
 	g_free (priv->source_pkgname);
+	g_string_free (priv->log, TRUE);
 	g_timer_destroy (priv->timer);
 	g_hash_table_unref (priv->configs);
 	g_ptr_array_unref (priv->releases);
@@ -119,6 +109,7 @@ asb_package_init (AsbPackage *pkg)
 {
 	AsbPackagePrivate *priv = GET_PRIVATE (pkg);
 	priv->enabled = TRUE;
+	priv->log = g_string_new (NULL);
 	priv->timer = g_timer_new ();
 	priv->deps = g_ptr_array_new_with_free_func (g_free);
 	priv->configs = g_hash_table_new_full (g_str_hash, g_str_equal,
@@ -126,42 +117,7 @@ asb_package_init (AsbPackage *pkg)
 	priv->releases = g_ptr_array_new_with_free_func ((GDestroyNotify) g_object_unref);
 	priv->releases_hash = g_hash_table_new_full (g_str_hash, g_str_equal,
 						     g_free, (GDestroyNotify) g_object_unref);
-	g_mutex_init (&priv->output_stream_mutex);
-}
-
-static gboolean
-asb_package_ensure_output_stream (AsbPackage *pkg, GError **error)
-{
-	AsbPackagePrivate *priv = GET_PRIVATE (pkg);
-	gint fd;
-	g_autofree gchar *fn = NULL;
-	g_autofree gchar *fn_dir = NULL;
-
-	/* already set up */
-	if (priv->output_stream != NULL)
-		return TRUE;
-
-	/* don't write if unset */
-	if (asb_package_get_config (pkg, "LogDir") == NULL)
-		return TRUE;
-
-	/* ensure log dir exists */
-	fn_dir = g_strdup_printf ("%s/%c",
-				  asb_package_get_config (pkg, "LogDir"),
-				  g_ascii_tolower (priv->name[0]));
-	if (!asb_utils_ensure_exists (fn_dir, error))
-		return FALSE;
-
-	/* open log file */
-	fn = g_strdup_printf ("%s/%s.log", fn_dir, priv->name);
-	fd = g_open (fn, O_WRONLY | O_CREAT | O_TRUNC, 0600);
-	if (fd < 0) {
-		g_set_error (error, 1, 0,
-			     "failed to open %s for writing", fn);
-		return FALSE;
-	}
-	priv->output_stream = g_unix_output_stream_new (fd, TRUE);
-	return TRUE;
+	g_mutex_init (&priv->mutex_log);
 }
 
 /**
@@ -232,58 +188,38 @@ asb_package_log (AsbPackage *pkg,
 	va_list args;
 	gdouble now;
 	g_autofree gchar *tmp = NULL;
-	g_autoptr(GError) error = NULL;
-	g_autoptr(GMutexLocker) locker = g_mutex_locker_new (&priv->output_stream_mutex);
-	g_autoptr(GString) str = g_string_new (NULL);
-
-	/* ensure we have the writer set up */
-	if (!asb_package_ensure_output_stream (pkg, &error)) {
-		g_warning ("failed to create output stream: %s", error->message);
-		return;
-	}
 
-	/* no logging enabled */
-	if (priv->output_stream == NULL)
-		return;
+	g_mutex_lock (&priv->mutex_log);
 
 	va_start (args, fmt);
 	tmp = g_strdup_vprintf (fmt, args);
 	va_end (args);
 	if (g_getenv ("ASB_PROFILE") != NULL) {
 		now = g_timer_elapsed (priv->timer, NULL) * 1000;
-		g_string_append_printf (str, "%05.0f\t+%05.0f\t",
+		g_string_append_printf (priv->log,
+					"%05.0f\t+%05.0f\t",
 					now, now - priv->last_log);
 		priv->last_log = now;
 	}
 	switch (log_level) {
 	case ASB_PACKAGE_LOG_LEVEL_INFO:
 		g_debug ("INFO:    %s", tmp);
-		g_string_append_printf (str, "INFO:    %s\n", tmp);
+		g_string_append_printf (priv->log, "INFO:    %s\n", tmp);
 		break;
 	case ASB_PACKAGE_LOG_LEVEL_DEBUG:
 		g_debug ("DEBUG:   %s", tmp);
-		g_string_append_printf (str, "DEBUG:   %s\n", tmp);
+		g_string_append_printf (priv->log, "DEBUG:   %s\n", tmp);
 		break;
 	case ASB_PACKAGE_LOG_LEVEL_WARNING:
 		g_debug ("WARNING: %s", tmp);
-		g_string_append_printf (str, "WARNING: %s\n", tmp);
+		g_string_append_printf (priv->log, "WARNING: %s\n", tmp);
 		break;
 	default:
 		g_debug ("%s", tmp);
-		g_string_append_printf (str, "%s\n", tmp);
+		g_string_append_printf (priv->log, "%s\n", tmp);
 		break;
 	}
-
-	/* write string to stream */
-	if (!g_output_stream_write_all (priv->output_stream,
-					str->str,
-					str->len,
-					NULL, /* bytes_written */
-					NULL,
-					&error)) {
-		g_warning ("failed to write to output stream: %s",
-			   error->message);
-	}
+	g_mutex_unlock (&priv->mutex_log);
 }
 
 /**
@@ -301,9 +237,26 @@ gboolean
 asb_package_log_flush (AsbPackage *pkg, GError **error)
 {
 	AsbPackagePrivate *priv = GET_PRIVATE (pkg);
-	if (priv->output_stream == NULL)
+	g_autofree gchar *logfile = NULL;
+	g_autofree gchar *logdir_char = NULL;
+
+	/* needs no update */
+	if (priv->log_written_len == priv->log->len)
+		return TRUE;
+
+	/* don't write if unset */
+	if (asb_package_get_config (pkg, "LogDir") == NULL)
 		return TRUE;
-	return g_output_stream_flush (priv->output_stream, NULL, error);
+
+	/* overwrite old log */
+	logdir_char = g_strdup_printf ("%s/%c",
+				       asb_package_get_config (pkg, "LogDir"),
+				       g_ascii_tolower (priv->name[0]));
+	if (!asb_utils_ensure_exists (logdir_char, error))
+		return FALSE;
+	priv->log_written_len = priv->log->len;
+	logfile = g_strdup_printf ("%s/%s.log", logdir_char, priv->name);
+	return g_file_set_contents (logfile, priv->log->str, -1, error);
 }
 
 /**