From 39039fd533b9457e2891c6b3f9b4af3628ea199e Mon Sep 17 00:00:00 2001 From: Yax <1949284+kianby@users.noreply.github.com> Date: Sat, 2 May 2015 13:43:38 +0200 Subject: [PATCH] Add first controller --- app/__init__.py | 3 +++ app/controllers/api.py | 12 ++++++++++++ app/{server.py => run.py} | 12 +++++------- run.sh | 2 +- 4 files changed, 21 insertions(+), 8 deletions(-) create mode 100644 app/__init__.py create mode 100644 app/controllers/api.py rename app/{server.py => run.py} (94%) diff --git a/app/__init__.py b/app/__init__.py new file mode 100644 index 0000000..d7562aa --- /dev/null +++ b/app/__init__.py @@ -0,0 +1,3 @@ +from flask import Flask + +app = Flask(__name__) diff --git a/app/controllers/api.py b/app/controllers/api.py new file mode 100644 index 0000000..0189c65 --- /dev/null +++ b/app/controllers/api.py @@ -0,0 +1,12 @@ +#!/usr/bin/env python +# -*- coding: utf-8 -*- + +import logging +from app import app + +logger = logging.getLogger(__name__) + + +@app.route("/comments", methods=['GET']) +def get_comments(): + return "OK" diff --git a/app/server.py b/app/run.py similarity index 94% rename from app/server.py rename to app/run.py index 59aa784..8c288b1 100644 --- a/app/server.py +++ b/app/run.py @@ -4,11 +4,8 @@ import os import sys import logging -from flask import Flask from werkzeug.contrib.fixers import ProxyFix -app = Flask(__name__) - # add current and parent path to syspath currentPath = os.path.dirname(__file__) parentPath = os.path.abspath(os.path.join(currentPath, os.path.pardir)) @@ -17,11 +14,13 @@ for path in paths: if path not in sys.path: sys.path.insert(0, path) -# configure logging - +# more imports import config +from app.services import database +from app.controllers import api +from app import app - +# configure logging def configure_logging(level): root_logger = logging.getLogger() root_logger.setLevel(level) @@ -40,7 +39,6 @@ configure_logging(logging_level) logger = logging.getLogger(__name__) # initialize database -from app.services import database database.setup() app.wsgi_app = ProxyFix(app.wsgi_app) diff --git a/run.sh b/run.sh index 0f471c8..a3b0364 100755 --- a/run.sh +++ b/run.sh @@ -1,3 +1,3 @@ #!/bin/sh -python app/server.py "$@" +python app/run.py "$@"