when invoked with -syncall, have the GET_LOCK time out after 45 minutes rather than 1 second, since we want syncall to happen anyway, even if other individual syncs are currently in progress. r=endico@mozilla.org

1 files changed, 6 insertions, 2 deletions

diff --git a/syncshadowdb b/syncshadowdb
index a78c18729..94e492044 100755
--- a/syncshadowdb
+++ b/syncshadowdb
@@ -86,8 +86,12 @@ $::param{'queryagainstshadowdb'} = 1; # Force us to be able to use the
 
 ConnectToDatabase(1);
 
-Verbose("Aquiring lock.");
-SendSQL("SELECT GET_LOCK('synclock', 1)");
+Verbose("Acquiring lock");
+if ( $syncall == 1) {
+    SendSQL("SELECT GET_LOCK('synclock', 2700)");
+} else {
+    SendSQL("SELECT GET_LOCK('synclock', 1)");
+}
 if (!FetchOneColumn()) {
     Verbose("Couldn't get the lock to do the shadow database syncing.");
     exit;