tracker r3010 - in trunk: . src/libtracker-common src/trackerd
- From: carlosg svn gnome org
- To: svn-commits-list gnome org
- Subject: tracker r3010 - in trunk: . src/libtracker-common src/trackerd
- Date: Tue, 3 Mar 2009 17:57:11 +0000 (UTC)
Author: carlosg
Date: Tue Mar 3 17:57:10 2009
New Revision: 3010
URL: http://svn.gnome.org/viewvc/tracker?rev=3010&view=rev
Log:
2009-03-03 Carlos Garnacho <carlos imendio com>
Do not wipe out/overwrite existing logs if there's a running instance.
* src/libtracker-common/tracker-log.c (tracker_log_init): Remove old
log file here, prior to creating the new one.
* src/trackerd/tracker-main.c (initialize_directories): Do not remove
the old log file here.
(main): Check whether there's a running instance before initializing
the logs subsystem.
Modified:
trunk/ChangeLog
trunk/src/libtracker-common/tracker-log.c
trunk/src/trackerd/tracker-main.c
Modified: trunk/src/libtracker-common/tracker-log.c
==============================================================================
--- trunk/src/libtracker-common/tracker-log.c (original)
+++ trunk/src/libtracker-common/tracker-log.c Tue Mar 3 17:57:10 2009
@@ -34,6 +34,7 @@
#include <glib/gstdio.h>
#include "tracker-log.h"
+#include "tracker-file-utils.h"
static gboolean initialized;
static GMutex *mutex;
@@ -148,6 +149,9 @@
return TRUE;
}
+ /* Remove previous log */
+ tracker_file_unlink (filename);
+
/* Open file */
fd = g_fopen (filename, "a");
if (!fd) {
Modified: trunk/src/trackerd/tracker-main.c
==============================================================================
--- trunk/src/trackerd/tracker-main.c (original)
+++ trunk/src/trackerd/tracker-main.c Tue Mar 3 17:57:10 2009
@@ -588,9 +588,6 @@
filename = g_build_filename (private->sys_tmp_dir, "Attachments", NULL);
g_mkdir_with_parents (filename, 00700);
g_free (filename);
-
- /* Remove existing log files */
- tracker_file_unlink (private->log_filename);
}
static gboolean
@@ -985,6 +982,10 @@
initialize_directories ();
+ if (!tracker_dbus_init (config)) {
+ return EXIT_FAILURE;
+ }
+
/* Initialize other subsystems */
tracker_log_init (private->log_filename, tracker_config_get_verbosity (config));
g_print ("Starting log:\n File:'%s'\n", private->log_filename);
@@ -993,10 +994,6 @@
tracker_nfs_lock_init (tracker_config_get_nfs_locking (config));
- if (!tracker_dbus_init (config)) {
- return EXIT_FAILURE;
- }
-
#ifdef HAVE_HAL
hal = tracker_hal_new ();
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]