From 0f1536fabe669443a34ecdc18d793a282baf7e31 Mon Sep 17 00:00:00 2001 From: nukeop Date: Fri, 2 Dec 2016 00:57:27 +0000 Subject: [PATCH] Procfile and changes for deployment --- Procfile | 1 + run.py | 8 ++++++-- smash/__init__.py | 7 ++++++- 3 files changed, 13 insertions(+), 3 deletions(-) create mode 100644 Procfile diff --git a/Procfile b/Procfile new file mode 100644 index 0000000..ee63fad --- /dev/null +++ b/Procfile @@ -0,0 +1 @@ +web: python run.py \ No newline at end of file diff --git a/run.py b/run.py index ec01bc6..573d6ab 100644 --- a/run.py +++ b/run.py @@ -1,4 +1,8 @@ -from smash import app +import os +from smash import app, conf if __name__=='__main__': - app.run() + if 'HEROKU' in conf.config and conf.config['HEROKU']==1: + app.run(host= '0.0.0.0', port=os.environ['PORT']) + else: + app.run(debug=True) diff --git a/smash/__init__.py b/smash/__init__.py index 2784e3b..4e7d058 100644 --- a/smash/__init__.py +++ b/smash/__init__.py @@ -1,3 +1,4 @@ +import os from flask import Flask from . import config, database, log, models @@ -5,7 +6,11 @@ from . import config, database, log, models log.configure_logging() app = Flask(__name__) conf = config.Config('config.json') -conf.save() + +# This flag tells the program it's deployed on heroku +if 'HEROKU' in os.environ: + conf.add(('HEROKU', 1)) + db = database.Database(conf.config["DBNAME"]) models.init_models(db)