Changeset 5d546a in indico

Timestamp:

03/14/11 09:30:19 (2 years ago)

Author:

Pedro Ferreira <jose.pedro.ferreira@…>

Branches:

master, burotel, hello-world-walkthrough, ipv6, v0.98-series, v0.98.2, v0.98.3, v0.98b1, v0.98b2, v0.99, b8c30da8ebdbdcbd675a873997cc3e95f567de49, 4287315ec967a3da168d83963c14001db8487d53

Children:

21bda7

Parents:

f5600f

git-author:

Pedro Ferreira <jose.pedro.ferreira@…> (03/14/11 09:29:12)

git-committer:

Pedro Ferreira <jose.pedro.ferreira@…> (03/14/11 09:30:19)

Message:

[FIX] Order of DB connection

• Also JS problem in livesync;
• Default number of retries;

Location:

indico

Files:

• ext/livesync/htdocs/js/livesync.js (modified) (1 diff)
• modules/scheduler/server.py (modified) (1 diff)
• modules/scheduler/slave.py (modified) (2 diffs)

indico/ext/livesync/htdocs/js/livesync.js

@@ -104 +104 @@
 
              button.observeClick(function() {
-                 console.log(Json.write(self.info));
                  self._submit(self.info, parameterManager, pmExtra, self.fullyEditable);
              });

indico/modules/scheduler/server.py

@@ -71 +71 @@
 
         # Number of times to try to run a task before aborting (min 1)
-        'task_max_tries': 2
+        'task_max_tries': 5
         }
 

indico/modules/scheduler/slave.py

@@ -66 +66 @@
         i = 0
 
+        self._dbi.startRequest()
         # RoomBooking forces us to connect to its own DB if needed
         # Maybe we should add some extension point here that lets plugins
@@ -72 +73 @@
         rbEnabled = info.getRoomBookingModuleActive()
 
-        self._dbi.startRequest()
         if rbEnabled:
             DALManager.connect()