From 4b08ba9b94b5646d2c1718afc49d0b958dbaf53f Mon Sep 17 00:00:00 2001 From: Sorrel Bri Date: Sat, 12 Oct 2019 10:40:12 -0700 Subject: [PATCH 01/42] add db upgrade --- Procfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Procfile b/Procfile index 8001d1a..55f725d 100644 --- a/Procfile +++ b/Procfile @@ -1 +1,2 @@ -web: gunicorn app:app \ No newline at end of file +web: gunicorn app:app +release: python3 manage.py db upgrade \ No newline at end of file From e34dc47a1c47e5c5163363e93051c3f41501edc6 Mon Sep 17 00:00:00 2001 From: Sorrel Bri Date: Sat, 12 Oct 2019 10:50:24 -0700 Subject: [PATCH 02/42] add server to Procfile --- Procfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Procfile b/Procfile index 55f725d..abf46ef 100644 --- a/Procfile +++ b/Procfile @@ -1,2 +1,2 @@ -web: gunicorn app:app +web: gunicorn server:app release: python3 manage.py db upgrade \ No newline at end of file From b136ede4182a1ff90d2d78f45534a98263924908 Mon Sep 17 00:00:00 2001 From: Sorrel Bri Date: Sat, 12 Oct 2019 10:54:23 -0700 Subject: [PATCH 03/42] add heroku psql db to config --- configuration/config.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configuration/config.py b/configuration/config.py index efdd88e..0f5e87f 100644 --- a/configuration/config.py +++ b/configuration/config.py @@ -31,4 +31,4 @@ class ProductionConfig(BaseConfig): """Production configuration.""" SECRET_KEY = '' DEBUG = False - SQLALCHEMY_DATABASE_URI = 'postgresql:///' + SQLALCHEMY_DATABASE_URI = 'postgres://mzwaocmnwvesac:d86d256a9e73639d0ac1eba3651f3f5268540e6417b110265fd58398358d1c1b@ec2-174-129-227-51.compute-1.amazonaws.com:5432/d1jbr1uiojpma' From f43e064570fd6410e39e1afe9a7083572fb5f52a Mon Sep 17 00:00:00 2001 From: Sorrel Bri Date: Sat, 12 Oct 2019 11:07:24 -0700 Subject: [PATCH 04/42] add secret key to prod config --- configuration/config.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configuration/config.py b/configuration/config.py index 0f5e87f..d326153 100644 --- a/configuration/config.py +++ b/configuration/config.py @@ -29,6 +29,6 @@ class TestingConfig(BaseConfig): class ProductionConfig(BaseConfig): """Production configuration.""" - SECRET_KEY = '' + SECRET_KEY = os.getenv('SECRET_KEY') DEBUG = False SQLALCHEMY_DATABASE_URI = 'postgres://mzwaocmnwvesac:d86d256a9e73639d0ac1eba3651f3f5268540e6417b110265fd58398358d1c1b@ec2-174-129-227-51.compute-1.amazonaws.com:5432/d1jbr1uiojpma' From 90fa05c10eb5e83638cd5b05c2f132404392a52c Mon Sep 17 00:00:00 2001 From: Sorrel Bri Date: Sat, 12 Oct 2019 11:28:21 -0700 Subject: [PATCH 05/42] add / message --- server.py | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/server.py b/server.py index a67d0ec..3791e13 100644 --- a/server.py +++ b/server.py @@ -10,8 +10,19 @@ from websockets.socket import socketio import configuration.models_mount from flask_migrate import Migrate +from flask import Blueprint, jsonify + +server = Blueprint('server', __name__, url_prefix='/') + +@server.route('/', methods=['GET']) +def api_home(): + response = {"message": "hello world"} + return jsonify(response) + if __name__ == '__main__': app = create_app() register_api_endpoints(app) + app.register_blueprint(server) migrate = Migrate(app, db) - socketio.run(app, debug=True) \ No newline at end of file + socketio.run(app, debug=True) + From fd8021c21f56eadcf354847eebddbb4532f979b3 Mon Sep 17 00:00:00 2001 From: Sorrel Bri Date: Sat, 12 Oct 2019 11:53:37 -0700 Subject: [PATCH 06/42] add gunicorn --- requirements.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/requirements.txt b/requirements.txt index 432ba18..97e457c 100644 --- a/requirements.txt +++ b/requirements.txt @@ -15,6 +15,7 @@ Flask-SocketIO==4.2.1 Flask-SQLAlchemy==2.4.1 Flask-Testing==0.7.1 greenlet==0.4.15 +gunicorn==19.9.0 isort==4.3.21 itsdangerous==1.1.0 Jinja2==2.10.1 From 9c76ab65e40bbf90e1352e6281c07a2190ff7625 Mon Sep 17 00:00:00 2001 From: Sorrel Bri Date: Sat, 12 Oct 2019 12:23:22 -0700 Subject: [PATCH 07/42] try removing 3 from release in Procfile --- Procfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Procfile b/Procfile index abf46ef..c8d9ef1 100644 --- a/Procfile +++ b/Procfile @@ -1,2 +1,2 @@ web: gunicorn server:app -release: python3 manage.py db upgrade \ No newline at end of file +release: python manage.py db upgrade \ No newline at end of file From b70a126958e2dc9885b91daf0a8c996ab4021453 Mon Sep 17 00:00:00 2001 From: Sorrel Bri Date: Sat, 12 Oct 2019 12:30:09 -0700 Subject: [PATCH 08/42] try changing gunicorn command --- Procfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Procfile b/Procfile index c8d9ef1..4724702 100644 --- a/Procfile +++ b/Procfile @@ -1,2 +1,2 @@ -web: gunicorn server:app +web: gunicorn server:server release: python manage.py db upgrade \ No newline at end of file From e5d77a839882e86a8d316f9a630ce8a495cef836 Mon Sep 17 00:00:00 2001 From: Sorrel Bri Date: Sat, 12 Oct 2019 12:34:05 -0700 Subject: [PATCH 09/42] define server:server --- server.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/server.py b/server.py index 3791e13..367e327 100644 --- a/server.py +++ b/server.py @@ -25,4 +25,10 @@ if __name__ == '__main__': app.register_blueprint(server) migrate = Migrate(app, db) socketio.run(app, debug=True) - + +def server(): + app = create_app() + register_api_endpoints(app) + app.register_blueprint(server) + migrate = Migrate(app, db) + socketio.run(app, debug=False) From c70336ffce911efdb3b7acf76460ffc8e3c27d87 Mon Sep 17 00:00:00 2001 From: Sorrel Bri Date: Sat, 12 Oct 2019 12:40:13 -0700 Subject: [PATCH 10/42] add worker-class eventlet to procfile --- Procfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Procfile b/Procfile index 4724702..6b37152 100644 --- a/Procfile +++ b/Procfile @@ -1,2 +1,2 @@ -web: gunicorn server:server +web: gunicorn --worker-class eventlet -w 1 server:server release: python manage.py db upgrade \ No newline at end of file From 6f38328c26ea3b51018a6b5f4f14cff9081a06ee Mon Sep 17 00:00:00 2001 From: Sorrel Bri Date: Sat, 12 Oct 2019 12:43:15 -0700 Subject: [PATCH 11/42] try geventWebSocketWorker in procfile --- Procfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Procfile b/Procfile index 6b37152..af19e3c 100644 --- a/Procfile +++ b/Procfile @@ -1,2 +1,2 @@ -web: gunicorn --worker-class eventlet -w 1 server:server +gunicorn -k geventwebsocket.gunicorn.workers.GeventWebSocketWorker -w 1 server:server release: python manage.py db upgrade \ No newline at end of file From e2c1c03bfc500e3600aa2866645287e9837f3233 Mon Sep 17 00:00:00 2001 From: Sorrel Bri Date: Sat, 12 Oct 2019 12:45:50 -0700 Subject: [PATCH 12/42] try no web --- Procfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Procfile b/Procfile index af19e3c..0bf6671 100644 --- a/Procfile +++ b/Procfile @@ -1,2 +1,2 @@ -gunicorn -k geventwebsocket.gunicorn.workers.GeventWebSocketWorker -w 1 server:server +gunicorn --worker-class eventlet -w 1 module:app release: python manage.py db upgrade \ No newline at end of file From 3051de03aa02619982a54e7ac50f624af4cd081b Mon Sep 17 00:00:00 2001 From: Sorrel Bri Date: Sat, 12 Oct 2019 12:47:59 -0700 Subject: [PATCH 13/42] fix module:app typo --- Procfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Procfile b/Procfile index 0bf6671..2c51f24 100644 --- a/Procfile +++ b/Procfile @@ -1,2 +1,2 @@ -gunicorn --worker-class eventlet -w 1 module:app +gunicorn --worker-class eventlet -w 1 server:server release: python manage.py db upgrade \ No newline at end of file From ef5bedb81084e6ec603f0e32af737dd3dbb90a91 Mon Sep 17 00:00:00 2001 From: Sorrel Bri Date: Sat, 12 Oct 2019 12:50:58 -0700 Subject: [PATCH 14/42] try renaming server command to run --- Procfile | 2 +- server.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Procfile b/Procfile index 2c51f24..6e10d5d 100644 --- a/Procfile +++ b/Procfile @@ -1,2 +1,2 @@ -gunicorn --worker-class eventlet -w 1 server:server +gunicorn --worker-class eventlet -w 1 server:run release: python manage.py db upgrade \ No newline at end of file diff --git a/server.py b/server.py index 367e327..6a52645 100644 --- a/server.py +++ b/server.py @@ -26,7 +26,7 @@ if __name__ == '__main__': migrate = Migrate(app, db) socketio.run(app, debug=True) -def server(): +def run(): app = create_app() register_api_endpoints(app) app.register_blueprint(server) From 7c440b33f3cd20cc32554faf9dbf1c3c80124c7d Mon Sep 17 00:00:00 2001 From: Sorrel Bri Date: Sat, 12 Oct 2019 12:59:32 -0700 Subject: [PATCH 15/42] empty commit --- server.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server.py b/server.py index 6a52645..d6ea214 100644 --- a/server.py +++ b/server.py @@ -5,7 +5,7 @@ from api.api import register_api_endpoints from auth.auth import auth # Web sockets -from websockets.socket import socketio +from websockets.socket import socketio import configuration.models_mount from flask_migrate import Migrate From 500bdd8037991394bf2c012cf2c18053ed5bcd6f Mon Sep 17 00:00:00 2001 From: Sorrel Bri Date: Sun, 13 Oct 2019 10:16:56 -0700 Subject: [PATCH 16/42] config gunicorn server:app --- Procfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Procfile b/Procfile index 6e10d5d..54d13e7 100644 --- a/Procfile +++ b/Procfile @@ -1,2 +1,2 @@ -gunicorn --worker-class eventlet -w 1 server:run +gunicorn --worker-class eventlet -w 1 server:app release: python manage.py db upgrade \ No newline at end of file From ba63ae2d582d83fe5702b3ddac8b02a29eaef6c1 Mon Sep 17 00:00:00 2001 From: Sorrel Bri Date: Sun, 13 Oct 2019 10:22:33 -0700 Subject: [PATCH 17/42] config server:run --- Procfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Procfile b/Procfile index 54d13e7..6e10d5d 100644 --- a/Procfile +++ b/Procfile @@ -1,2 +1,2 @@ -gunicorn --worker-class eventlet -w 1 server:app +gunicorn --worker-class eventlet -w 1 server:run release: python manage.py db upgrade \ No newline at end of file From 0ccce5f73b19413af6c0c88375e13594b89ee49f Mon Sep 17 00:00:00 2001 From: Sorrel Bri Date: Sun, 13 Oct 2019 10:25:14 -0700 Subject: [PATCH 18/42] return created app in server --- Procfile | 2 +- server.py | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Procfile b/Procfile index 6e10d5d..54d13e7 100644 --- a/Procfile +++ b/Procfile @@ -1,2 +1,2 @@ -gunicorn --worker-class eventlet -w 1 server:run +gunicorn --worker-class eventlet -w 1 server:app release: python manage.py db upgrade \ No newline at end of file diff --git a/server.py b/server.py index d6ea214..879f332 100644 --- a/server.py +++ b/server.py @@ -25,6 +25,7 @@ if __name__ == '__main__': app.register_blueprint(server) migrate = Migrate(app, db) socketio.run(app, debug=True) + return app def run(): app = create_app() @@ -32,3 +33,4 @@ def run(): app.register_blueprint(server) migrate = Migrate(app, db) socketio.run(app, debug=False) + return app From ad2efb4df3143d23b7d258efac3f8ff4238b26a3 Mon Sep 17 00:00:00 2001 From: Sorrel Bri Date: Sun, 13 Oct 2019 10:28:06 -0700 Subject: [PATCH 19/42] try config procfile server:socketio --- Procfile | 2 +- server.py | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/Procfile b/Procfile index 54d13e7..4acc34f 100644 --- a/Procfile +++ b/Procfile @@ -1,2 +1,2 @@ -gunicorn --worker-class eventlet -w 1 server:app +gunicorn --worker-class eventlet -w 1 server:socketio release: python manage.py db upgrade \ No newline at end of file diff --git a/server.py b/server.py index 879f332..d6ea214 100644 --- a/server.py +++ b/server.py @@ -25,7 +25,6 @@ if __name__ == '__main__': app.register_blueprint(server) migrate = Migrate(app, db) socketio.run(app, debug=True) - return app def run(): app = create_app() @@ -33,4 +32,3 @@ def run(): app.register_blueprint(server) migrate = Migrate(app, db) socketio.run(app, debug=False) - return app From b0f46e80cbf33d0794fbf3dd98dafbe507ca2a6f Mon Sep 17 00:00:00 2001 From: Sorrel Bri Date: Sun, 13 Oct 2019 10:42:01 -0700 Subject: [PATCH 20/42] try procfile server:server --- Procfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Procfile b/Procfile index 4acc34f..2c51f24 100644 --- a/Procfile +++ b/Procfile @@ -1,2 +1,2 @@ -gunicorn --worker-class eventlet -w 1 server:socketio +gunicorn --worker-class eventlet -w 1 server:server release: python manage.py db upgrade \ No newline at end of file From 9553454d183aeffa2e20babfc6a0da8fa3272aa2 Mon Sep 17 00:00:00 2001 From: Sorrel Bri Date: Sun, 13 Oct 2019 21:55:51 -0700 Subject: [PATCH 21/42] reconfig env variable for socketio cors --- app.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app.py b/app.py index bc61392..7268ea3 100644 --- a/app.py +++ b/app.py @@ -18,7 +18,7 @@ app.config.from_object(os.getenv('CONFIGURATION_OBJECT')) # ! Environment Variable # TODO export ALLOWED_ORIGIN= whatever the react server is # TODO cors_allowed_origins=os.getenv('ALLOWED_ORIGIN') -socketio = SocketIO(app, cors_allowed_origins=['http://localhost:3000', 'http://localhost:3001']) +socketio = SocketIO(app, cors_allowed_origins=os.getenv('ALLOWED_ORIGIN')) def create_app(): CORS(app, resources={ From 3a605bf1dad26e9ca2058c7dc5cd3c09e71eebd1 Mon Sep 17 00:00:00 2001 From: Sorrel Bri Date: Sun, 13 Oct 2019 21:58:00 -0700 Subject: [PATCH 22/42] remove redundant run from server --- server.py | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/server.py b/server.py index d6ea214..06e5139 100644 --- a/server.py +++ b/server.py @@ -20,15 +20,9 @@ def api_home(): return jsonify(response) if __name__ == '__main__': - app = create_app() - register_api_endpoints(app) - app.register_blueprint(server) - migrate = Migrate(app, db) - socketio.run(app, debug=True) - -def run(): app = create_app() register_api_endpoints(app) app.register_blueprint(server) migrate = Migrate(app, db) socketio.run(app, debug=False) + From dbf269ba77669f785510e48e649653e46a3a9285 Mon Sep 17 00:00:00 2001 From: Sorrel Bri Date: Sun, 13 Oct 2019 22:05:39 -0700 Subject: [PATCH 23/42] empty commit --- server.py | 1 + 1 file changed, 1 insertion(+) diff --git a/server.py b/server.py index 06e5139..b25449b 100644 --- a/server.py +++ b/server.py @@ -26,3 +26,4 @@ if __name__ == '__main__': migrate = Migrate(app, db) socketio.run(app, debug=False) + \ No newline at end of file From 2e7754cc0bda81f0ce39b3e69bea4fed89721b84 Mon Sep 17 00:00:00 2001 From: Sorrel Bri Date: Sun, 13 Oct 2019 22:07:07 -0700 Subject: [PATCH 24/42] empty commit --- server.py | 1 - 1 file changed, 1 deletion(-) diff --git a/server.py b/server.py index b25449b..06e5139 100644 --- a/server.py +++ b/server.py @@ -26,4 +26,3 @@ if __name__ == '__main__': migrate = Migrate(app, db) socketio.run(app, debug=False) - \ No newline at end of file From 9f8b6dd96401bdfb57d92587e14c19f44d3b9c1c Mon Sep 17 00:00:00 2001 From: Sorrel Bri Date: Sun, 13 Oct 2019 22:08:16 -0700 Subject: [PATCH 25/42] empty commit --- server.py | 1 - 1 file changed, 1 deletion(-) diff --git a/server.py b/server.py index 06e5139..64990fe 100644 --- a/server.py +++ b/server.py @@ -25,4 +25,3 @@ if __name__ == '__main__': app.register_blueprint(server) migrate = Migrate(app, db) socketio.run(app, debug=False) - From c132cea6798be2729fba80e7fa249b0e6b5fc7f0 Mon Sep 17 00:00:00 2001 From: Sorrel Bri Date: Sun, 13 Oct 2019 22:09:50 -0700 Subject: [PATCH 26/42] empty commit --- server.py | 1 + 1 file changed, 1 insertion(+) diff --git a/server.py b/server.py index 64990fe..6c5dd58 100644 --- a/server.py +++ b/server.py @@ -25,3 +25,4 @@ if __name__ == '__main__': app.register_blueprint(server) migrate = Migrate(app, db) socketio.run(app, debug=False) + \ No newline at end of file From 999b28c0b7869c42b8c51cf02d54a7443515aef5 Mon Sep 17 00:00:00 2001 From: Sorrel Bri Date: Sun, 13 Oct 2019 22:15:00 -0700 Subject: [PATCH 27/42] empty commit --- server.py | 1 - 1 file changed, 1 deletion(-) diff --git a/server.py b/server.py index 6c5dd58..64990fe 100644 --- a/server.py +++ b/server.py @@ -25,4 +25,3 @@ if __name__ == '__main__': app.register_blueprint(server) migrate = Migrate(app, db) socketio.run(app, debug=False) - \ No newline at end of file From 39fc292791c7988c41dfe97894a821c9a3c958a2 Mon Sep 17 00:00:00 2001 From: Sorrel Bri Date: Sun, 13 Oct 2019 22:17:04 -0700 Subject: [PATCH 28/42] empty commit --- server.py | 1 + 1 file changed, 1 insertion(+) diff --git a/server.py b/server.py index 64990fe..6c5dd58 100644 --- a/server.py +++ b/server.py @@ -25,3 +25,4 @@ if __name__ == '__main__': app.register_blueprint(server) migrate = Migrate(app, db) socketio.run(app, debug=False) + \ No newline at end of file From fb4324cb42e7700f841340d1a129803173663c13 Mon Sep 17 00:00:00 2001 From: Sorrel Bri Date: Mon, 14 Oct 2019 16:40:29 -0700 Subject: [PATCH 29/42] try add psycopg2 connection --- server.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/server.py b/server.py index 6c5dd58..875debe 100644 --- a/server.py +++ b/server.py @@ -11,7 +11,7 @@ import configuration.models_mount from flask_migrate import Migrate from flask import Blueprint, jsonify - +import psycopg2 server = Blueprint('server', __name__, url_prefix='/') @server.route('/', methods=['GET']) @@ -24,5 +24,9 @@ if __name__ == '__main__': register_api_endpoints(app) app.register_blueprint(server) migrate = Migrate(app, db) + # added 10/14 + DATABASE_URL = os.environ['DATABASE_URL'] + conn = psycopg2.connect(DATABASE_URL, sslmode='require') + socketio.run(app, debug=False) \ No newline at end of file From 9f8d8004b8a7752b81f4257749de60e1d0399bb5 Mon Sep 17 00:00:00 2001 From: Sorrel Bri Date: Mon, 14 Oct 2019 16:48:43 -0700 Subject: [PATCH 30/42] empty commit --- app.py | 1 + 1 file changed, 1 insertion(+) diff --git a/app.py b/app.py index 7268ea3..cb218c2 100644 --- a/app.py +++ b/app.py @@ -28,3 +28,4 @@ def create_app(): db.init_app(app) ma.init_app(app) return app + \ No newline at end of file From 015c2a9776ab771fc33ae0a2c113f8a7402d0de7 Mon Sep 17 00:00:00 2001 From: Sorrel Bri Date: Mon, 14 Oct 2019 16:53:41 -0700 Subject: [PATCH 31/42] change app.config in manage.py --- manage.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manage.py b/manage.py index 9d4590a..2949a46 100644 --- a/manage.py +++ b/manage.py @@ -22,7 +22,7 @@ from models.Move import Move from models.User import User -app.config['SQLALCHEMY_DATABASE_URI'] = 'postgresql://localhost/browser-go' +app.config['SQLALCHEMY_DATABASE_URI'] = os.getenv('SQLALCHEMY_DATABASE_URI') @manager.command def test(): """Runs the unit tests without test coverage.""" From 28c55cdb33b94fb1287834ff83ba9d9f35d04c29 Mon Sep 17 00:00:00 2001 From: Sorrel Bri Date: Mon, 14 Oct 2019 16:55:22 -0700 Subject: [PATCH 32/42] change app.config in manage.py --- manage.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manage.py b/manage.py index 2949a46..ab79c03 100644 --- a/manage.py +++ b/manage.py @@ -22,7 +22,7 @@ from models.Move import Move from models.User import User -app.config['SQLALCHEMY_DATABASE_URI'] = os.getenv('SQLALCHEMY_DATABASE_URI') +app.config['SQLALCHEMY_DATABASE_URI'] = os.getenv('DATABASE_URL') @manager.command def test(): """Runs the unit tests without test coverage.""" From 8e6abb8b101bee8d088291c8d9b04c5c52baad3d Mon Sep 17 00:00:00 2001 From: Sorrel Bri Date: Mon, 14 Oct 2019 17:04:57 -0700 Subject: [PATCH 33/42] reset heroku db --- models/Game.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/models/Game.py b/models/Game.py index 4f0c873..ab74f72 100644 --- a/models/Game.py +++ b/models/Game.py @@ -84,6 +84,6 @@ class GameSchema(ma.Schema): player_black = fields.Int() player_white = fields.Int() - + game_schema = GameSchema() games_schema = GameSchema(many=True) \ No newline at end of file From 7375661d1819cffaae32088b35956bcbdcaa4ade Mon Sep 17 00:00:00 2001 From: Sorrel Bri Date: Mon, 14 Oct 2019 17:09:31 -0700 Subject: [PATCH 34/42] add web: to Procfile --- Procfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Procfile b/Procfile index 2c51f24..6b37152 100644 --- a/Procfile +++ b/Procfile @@ -1,2 +1,2 @@ -gunicorn --worker-class eventlet -w 1 server:server +web: gunicorn --worker-class eventlet -w 1 server:server release: python manage.py db upgrade \ No newline at end of file From 4d52b386960d3f23401cf67314c7160b783d3227 Mon Sep 17 00:00:00 2001 From: Sorrel Bri Date: Mon, 14 Oct 2019 17:13:50 -0700 Subject: [PATCH 35/42] remove options from Procfile --- Procfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Procfile b/Procfile index 6b37152..4724702 100644 --- a/Procfile +++ b/Procfile @@ -1,2 +1,2 @@ -web: gunicorn --worker-class eventlet -w 1 server:server +web: gunicorn server:server release: python manage.py db upgrade \ No newline at end of file From b4d165e9ff2a07a6e131460ffb37e13a043787d5 Mon Sep 17 00:00:00 2001 From: Sorrel Bri Date: Mon, 14 Oct 2019 17:16:53 -0700 Subject: [PATCH 36/42] change procfile to server:app --- Procfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Procfile b/Procfile index 4724702..c2f4020 100644 --- a/Procfile +++ b/Procfile @@ -1,2 +1,2 @@ -web: gunicorn server:server -release: python manage.py db upgrade \ No newline at end of file +web: gunicorn server:app +release: python manage.py db upgrade \ No newline at end of file From e0942fe459e1a2005e11b04d0b1c51519dc4c127 Mon Sep 17 00:00:00 2001 From: Sorrel Bri Date: Mon, 14 Oct 2019 17:20:19 -0700 Subject: [PATCH 37/42] def run in server.py --- Procfile | 2 +- server.py | 14 ++++++++++++-- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/Procfile b/Procfile index c2f4020..d11aab7 100644 --- a/Procfile +++ b/Procfile @@ -1,2 +1,2 @@ -web: gunicorn server:app +web: gunicorn server:run release: python manage.py db upgrade \ No newline at end of file diff --git a/server.py b/server.py index 875debe..1c831cd 100644 --- a/server.py +++ b/server.py @@ -27,6 +27,16 @@ if __name__ == '__main__': # added 10/14 DATABASE_URL = os.environ['DATABASE_URL'] conn = psycopg2.connect(DATABASE_URL, sslmode='require') - + + socketio.run(app, debug=False) + +def run: + app = create_app() + register_api_endpoints(app) + app.register_blueprint(server) + migrate = Migrate(app, db) + # added 10/14 + DATABASE_URL = os.environ['DATABASE_URL'] + conn = psycopg2.connect(DATABASE_URL, sslmode='require') + socketio.run(app, debug=False) - \ No newline at end of file From 2f146c96f6b6ac14f5848031181cb408a9f6d2aa Mon Sep 17 00:00:00 2001 From: Sorrel Bri Date: Wed, 16 Oct 2019 16:22:33 -0700 Subject: [PATCH 38/42] try new procfile --- Procfile | 2 +- server.py | 26 ++++++++------------------ 2 files changed, 9 insertions(+), 19 deletions(-) diff --git a/Procfile b/Procfile index d11aab7..15ba5a7 100644 --- a/Procfile +++ b/Procfile @@ -1,2 +1,2 @@ -web: gunicorn server:run +web: gunicorn --worker-class socketio.sgunicorn.GeventSocketIOWorker --log-file=- server:app release: python manage.py db upgrade \ No newline at end of file diff --git a/server.py b/server.py index 1c831cd..c0dcfcb 100644 --- a/server.py +++ b/server.py @@ -19,24 +19,14 @@ def api_home(): response = {"message": "hello world"} return jsonify(response) +app = create_app() +register_api_endpoints(app) +app.register_blueprint(server) +migrate = Migrate(app, db) +# added 10/14 +DATABASE_URL = os.environ['DATABASE_URL'] +conn = psycopg2.connect(DATABASE_URL, sslmode='require') + if __name__ == '__main__': - app = create_app() - register_api_endpoints(app) - app.register_blueprint(server) - migrate = Migrate(app, db) - # added 10/14 - DATABASE_URL = os.environ['DATABASE_URL'] - conn = psycopg2.connect(DATABASE_URL, sslmode='require') - socketio.run(app, debug=False) -def run: - app = create_app() - register_api_endpoints(app) - app.register_blueprint(server) - migrate = Migrate(app, db) - # added 10/14 - DATABASE_URL = os.environ['DATABASE_URL'] - conn = psycopg2.connect(DATABASE_URL, sslmode='require') - - socketio.run(app, debug=False) From ffe7b286d9fffd3bdaf2dbfd36446ae47d730934 Mon Sep 17 00:00:00 2001 From: Sorrel Bri Date: Wed, 16 Oct 2019 16:30:37 -0700 Subject: [PATCH 39/42] empty commit --- server.py | 1 - 1 file changed, 1 deletion(-) diff --git a/server.py b/server.py index c0dcfcb..03d19ce 100644 --- a/server.py +++ b/server.py @@ -29,4 +29,3 @@ conn = psycopg2.connect(DATABASE_URL, sslmode='require') if __name__ == '__main__': socketio.run(app, debug=False) - From d332b48f092fcad10f9e5299a97373c4159dbefb Mon Sep 17 00:00:00 2001 From: Sorrel Bri Date: Wed, 16 Oct 2019 16:47:36 -0700 Subject: [PATCH 40/42] change procfile --- Procfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Procfile b/Procfile index 15ba5a7..9c70479 100644 --- a/Procfile +++ b/Procfile @@ -1,2 +1,2 @@ -web: gunicorn --worker-class socketio.sgunicorn.GeventSocketIOWorker --log-file=- server:app +web: gunicorn --worker-class eventlet -w 1 --log-file=- server:app release: python manage.py db upgrade \ No newline at end of file From 2dd1765c4747a3ec67c81ec6af8a983f2d9cab53 Mon Sep 17 00:00:00 2001 From: Sorrel Bri Date: Wed, 16 Oct 2019 16:50:55 -0700 Subject: [PATCH 41/42] change procfile remove worker --- Procfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Procfile b/Procfile index 9c70479..c2f4020 100644 --- a/Procfile +++ b/Procfile @@ -1,2 +1,2 @@ -web: gunicorn --worker-class eventlet -w 1 --log-file=- server:app +web: gunicorn server:app release: python manage.py db upgrade \ No newline at end of file From e4f2a455c2806d4bebd2c3a8c2a2aa97c554a20b Mon Sep 17 00:00:00 2001 From: Sorrel Bri Date: Wed, 16 Oct 2019 16:52:15 -0700 Subject: [PATCH 42/42] add os import to server --- server.py | 1 + 1 file changed, 1 insertion(+) diff --git a/server.py b/server.py index 03d19ce..a463303 100644 --- a/server.py +++ b/server.py @@ -1,4 +1,5 @@ from app import create_app, db +import os # Blueprints from api.api import register_api_endpoints