[glom] Add more delay so that self-hosting does not fail sometimes.
- From: Murray Cumming <murrayc src gnome org>
- To: svn-commits-list gnome org
- Subject: [glom] Add more delay so that self-hosting does not fail sometimes.
- Date: Mon, 27 Jul 2009 11:36:30 +0000 (UTC)
commit 354276413ee3a93e22e37ccabcf2d0903dec0b32
Author: Murray Cumming <murrayc murrayc com>
Date: Mon Jul 27 13:36:14 2009 +0200
Add more delay so that self-hosting does not fail sometimes.
* glom/libglom/spawn_with_feedback.cc:
execute_command_line_and_wait_until_second_command_returns_success(): Wait
for extra 8 seconds instead of 3, so that postgresql startup has really
finished. The delay was not enough since I removed the debug output, which
was probably providing extra delay.
This is unpleasant.
ChangeLog | 11 +++++++++++
.../connectionpool_backends/postgres_self.cc | 2 +-
glom/libglom/spawn_with_feedback.cc | 2 +-
3 files changed, 13 insertions(+), 2 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index ec50e01..445730d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2009-07-27 Murray Cumming <murrayc murrayc com>
+
+ Add more delay so that self-hosting does not fail sometimes.
+
+ * glom/libglom/spawn_with_feedback.cc:
+ execute_command_line_and_wait_until_second_command_returns_success(): Wait
+ for extra 8 seconds instead of 3, so that postgresql startup has really
+ finished. The delay was not enough since I removed the debug output, which
+ was probably providing extra delay.
+ This is unpleasant.
+
2009-07-25 Daniel Elstner <danielk openismus com>
List auto-generated files in MAINTAINERCLEANFILES
diff --git a/glom/libglom/connectionpool_backends/postgres_self.cc b/glom/libglom/connectionpool_backends/postgres_self.cc
index 472b27d..5640b1f 100644
--- a/glom/libglom/connectionpool_backends/postgres_self.cc
+++ b/glom/libglom/connectionpool_backends/postgres_self.cc
@@ -356,7 +356,7 @@ bool PostgresSelfHosted::startup(const SlotProgress& slot_progress, bool network
}
m_port = available_port; //Remember it for later.
-
+
return true;
}
diff --git a/glom/libglom/spawn_with_feedback.cc b/glom/libglom/spawn_with_feedback.cc
index eac7ea3..d4d75b7 100644
--- a/glom/libglom/spawn_with_feedback.cc
+++ b/glom/libglom/spawn_with_feedback.cc
@@ -544,7 +544,7 @@ bool execute_command_line_and_wait_until_second_command_returns_success(const st
Glib::RefPtr<Glib::MainLoop> mainloop = Glib::MainLoop::create(false);
sigc::connection connection_timeout = Glib::signal_timeout().connect(
sigc::bind(sigc::ptr_fun(&on_timeout_delay), sigc::ref(mainloop)),
- 3000);
+ 8000);
mainloop->run();
connection_timeout.disconnect();
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]