summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJamie McCracken <jamiemcc@src.gnome.org>2007-08-11 13:19:24 +0000
committerJamie McCracken <jamiemcc@src.gnome.org>2007-08-11 13:19:24 +0000
commita769fc88f127f854e6606af9d52dfcdffb177677 (patch)
tree34b1d7382e1a672ceb064c8867db0e292f22c53e
parentf3a35dd04f7a2d6f8c49be2c2f4174b04e5ff32f (diff)
downloadtracker-a769fc88f127f854e6606af9d52dfcdffb177677.tar.gz
fixes for alarm and prevent delays in startup time
svn path=/trunk/; revision=770
-rw-r--r--ChangeLog5
-rw-r--r--po/ChangeLog4
-rw-r--r--po/LINGUAS1
-rw-r--r--src/trackerd/tracker-os-dependant-unix.c3
-rw-r--r--src/trackerd/trackerd.c4
5 files changed, 15 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 9afd0910a..d7faac7a2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-08-11 Jamie McCracken <jamiemcc at gnome org>
+
+ * Put back alarm call to tracker spawn as safeguard
+
+
2007-08-10 Laurent Aguerreche <laurent.aguerreche@free.fr>
* Fixed bug #465176 (IMAP e-mail indexing does not work after first crawl)
diff --git a/po/ChangeLog b/po/ChangeLog
index b662df31b..fd351af02 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,7 @@
+2007-08-11 Jamie McCracken <jamiemcc st gnome.org>
+
+ * removed lt from LINGUAS as lt.po is missing from svn and breaks compile
+
2007-08-11 Ilkka Tuohela <hile@iki.fi>
* fi.po: Updated Finnish translation by Timo Jyrinki.
diff --git a/po/LINGUAS b/po/LINGUAS
index 8de173613..13d258a45 100644
--- a/po/LINGUAS
+++ b/po/LINGUAS
@@ -13,7 +13,6 @@ fi
fr
gl
it
-lt
mk
nb
nl
diff --git a/src/trackerd/tracker-os-dependant-unix.c b/src/trackerd/tracker-os-dependant-unix.c
index 2e5a248d8..08ec837a7 100644
--- a/src/trackerd/tracker-os-dependant-unix.c
+++ b/src/trackerd/tracker-os-dependant-unix.c
@@ -161,4 +161,7 @@ tracker_child_cb (gpointer user_data)
g_printerr ("ERROR: trying to set nice value\n");
}
+ /* have this as a precaution in cases where cpu limit has not been reached due to spawned app sleeping */
+ alarm (timeout+2);
+
}
diff --git a/src/trackerd/trackerd.c b/src/trackerd/trackerd.c
index 67e6e7e64..709bbade0 100644
--- a/src/trackerd/trackerd.c
+++ b/src/trackerd/trackerd.c
@@ -2497,7 +2497,8 @@ main (int argc, char **argv)
tracker->update_count = get_update_count (main_thread_db_con);
- if (tracker->is_running && (tracker->update_count > tracker->optimization_count)) {
+/* disable this for now as it might slow things down */
+/* if (tracker->is_running && (tracker->update_count > tracker->optimization_count)) {
tracker_indexer_optimize (tracker->file_indexer);
@@ -2505,6 +2506,7 @@ main (int argc, char **argv)
tracker->first_time_index = FALSE;
tracker->update_count = 0;
}
+*/
tracker_db_get_static_data (db_con);