X-Git-Url: http://git.cascardo.eti.br/?a=blobdiff_plain;f=quickrun.py;h=4bd580285a2631b083a00de83aa887e99b1b69a5;hb=678c35ffc62b62645ee8d8a86b38f445d0bbfa2d;hp=c565fcb521d130628faa0ed9c547e4de12890155;hpb=cfe24fa3dc15d87f3ace944a2d62a0f4c5ee496c;p=cascardo%2Fipsilon.git

diff --git a/quickrun.py b/quickrun.py
index c565fcb..4bd5802 100755
--- a/quickrun.py
+++ b/quickrun.py
@@ -51,6 +51,7 @@ def config(workdir):
     subprocess.call(['sqlite3', '-init', sql, users_db, '.quit'])
 
     trans_db = os.path.join(workdir, 'transactions.sqlite')
+    cachedir = os.path.join(workdir, 'cache')
 
     with open(CONF_TEMPLATE) as f:
         conf_template = f.read()
@@ -59,6 +60,7 @@ def config(workdir):
                          'instance': 'idp',
                          'staticdir': os.getcwd(),
                          'datadir': workdir,
+                         'cachedir': cachedir,
                          'admindb': admin_db,
                          'usersdb': users_db,
                          'transdb': trans_db,
@@ -66,6 +68,7 @@ def config(workdir):
                          'sessopt': 'path',
                          'sessval': os.path.join(workdir, 'sessions'),
                          'secure': 'False',
+                         'cleanup_interval': 1,
                         })
     conf = os.path.join(workdir, 'ipsilon.conf')
     with open(conf, 'w+') as f:
@@ -80,6 +83,7 @@ if __name__ == '__main__':
     penv.update(os.environ)
     penv['PYTHONPATH'] = os.getcwd()
 
+    schema_init = os.path.join(os.getcwd(), 'ipsilon/install/ipsilon-upgrade-database')
     exe = os.path.join(os.getcwd(), 'ipsilon/ipsilon')
 
     if args['cleanup']:
@@ -94,8 +98,15 @@ if __name__ == '__main__':
         os.symlink(os.path.join(os.getcwd(), 'ui'),
                    os.path.join(args['workdir'], 'ui'))
 
+    if not os.path.exists(os.path.join(args['workdir'], 'cache')):
+        # This is only used in quickrun. Apache serves this directly
+        os.makedirs(os.path.join(args['workdir'], 'cache'))
 
     os.chdir(args['workdir'])
 
-    p = subprocess.Popen([exe, conf], env=penv)
+    p = subprocess.Popen([schema_init, conf], env=penv)
     p.wait()
+
+    if p.returncode == 0:
+        p = subprocess.Popen([exe, conf], env=penv)
+        p.wait()