PR581 Fixed setup files and models for pyramid

pyramid/frameworkbenchmarks/models.py

@@ -51,10 +51,10 @@ class World(DatabaseBase):
     __tablename__ = 'World'
 
     id = Column('id', Integer, primary_key=True)
-    randomNumber = Column('randomNumber', Integer, nullable=False, server_default='0')
+    randomNumber = Column('randomnumber', Integer, nullable=False, server_default='0')
 
     def __json__(self):
-        return {'id': self.id, 'randomNumber': self.randomNumber}
+        return {'id': self.id, 'randomnumber': self.randomNumber}
 
 
 class Fortune(DatabaseBase):

pyramid/setup_py2.py

@@ -4,6 +4,7 @@ import multiprocessing
 import os
 
 home = os.path.expanduser('~')
+pyramid_dir = home + "/FrameworkBenchmarks/pyramid"
 bin_dir = os.path.expanduser('~/FrameworkBenchmarks/installs/py2/bin')
 NCPU = multiprocessing.cpu_count()
 
@@ -13,21 +14,21 @@ proc = None
 def start(args):
     global proc
     setup_util.replace_text(
-        "frameworkbenchmarks/models.py",
+        pyramid_dir + "/frameworkbenchmarks/models.py",
         "DBHOSTNAME = 'localhost'",
         "DBHOSTNAME = '%s'" % args.database_host
     )
-    subprocess.call(bin_dir + '/pip install -e .', cwd='pyramid', shell=True)
+    subprocess.call(bin_dir + '/pip install -e .', cwd='pyramid', shell=True, stderr=errfile, stdout=logfile)
     proc = subprocess.Popen([
         bin_dir + '/gunicorn',
         'wsgi:app',
         '-b', "0.0.0.0:6543",
         '-w', str(NCPU*3)],
-        cwd='pyramid'
+        cwd='pyramid', stderr=errfile, stdout=logfile
     )
     return 0
 
-def stop():
+def stop(logfile, errfile):
     global proc
     if proc is not None:
         proc.terminate()

pyramid/setup_py3.py

@@ -4,30 +4,31 @@ import multiprocessing
 import os
 
 home = os.path.expanduser('~')
+pyramid_dir = home + "/FrameworkBenchmarks/pyramid"
 bin_dir = os.path.expanduser('~/FrameworkBenchmarks/installs/py3/bin')
 NCPU = multiprocessing.cpu_count()
 
 proc = None
 
 
-def start(args):
+def start(args, logfile, errfile):
     global proc
     setup_util.replace_text(
-        "frameworkbenchmarks/models.py",
+        pyramid_dir + "/frameworkbenchmarks/models.py",
         "DBHOSTNAME = 'localhost'",
         "DBHOSTNAME = '%s'" % args.database_host
     )
-    subprocess.call(bin_dir + '/pip install -e .', cwd='pyramid', shell=True)
+    subprocess.call(bin_dir + '/pip install -e .', cwd='pyramid', shell=True, stderr=errfile, stdout=logfile)
     proc = subprocess.Popen([
         bin_dir + '/gunicorn',
         'wsgi:app',
         '-b', "0.0.0.0:6543",
         '-w', str(NCPU*3)],
-        cwd='pyramid'
+        cwd='pyramid', stderr=errfile, stdout=logfile
     )
     return 0
 
-def stop():
+def stop(logfile, errfile):
     global proc
     if proc is not None:
         proc.terminate()