Skip to content

Commit

Permalink
test for double config
Browse files Browse the repository at this point in the history
  • Loading branch information
cekk committed Jan 26, 2020
1 parent 50bd762 commit 2fe8295
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 24 deletions.
31 changes: 9 additions & 22 deletions app.py
Original file line number Diff line number Diff line change
@@ -1,31 +1,14 @@
# -*- coding: utf-8 -*-
from flask import Blueprint
from flask import Flask
from flask import current_app
from flask import render_template
from flask import request
from flask_restful import abort
from flask_jwt_extended import JWTManager
from flask_restful import Api
from flask_restful import reqparse
from flask_restful import Resource
from functools import wraps
from routes.api import api_bp
from routes.frontend import frontend
from utils import createSocketMessage
from utils import mqtt
from utils import socketio

from flask_jwt_extended import (
JWTManager,
jwt_required,
create_access_token,
get_jwt_identity,
)

import logging
import os
import re

parser = reqparse.RequestParser()
parser.add_argument("command", type=str, help="")

Expand All @@ -48,22 +31,26 @@ def connect_handler():

def create_app(debug=False, local=False):
"""Create an application."""
app = Flask(__name__, instance_relative_config=True, static_folder="static/build")
app = Flask(
__name__, instance_relative_config=True, static_folder="static/build"
)
app.config.from_pyfile("config.py")
api = Api(api_bp)
Api(api_bp)
app.register_blueprint(api_bp)

if local:
app.config["LOCAL"] = True
app.register_blueprint(frontend)

jwt = JWTManager(app)
JWTManager(app)
socketio.init_app(app)
mqtt.init_app(app)

for blind in app.config.get("BLINDS", []):
mqtt.subscribe("shellies/{id}/online".format(id=blind.get("id", "")))
mqtt.subscribe("shellies/{id}/roller/0/pos".format(id=blind.get("id", "")))
mqtt.subscribe(
"shellies/{id}/roller/0/pos".format(id=blind.get("id", ""))
)
mqtt.subscribe("shellies/{id}/roller/0".format(id=blind.get("id", "")))

return app
4 changes: 2 additions & 2 deletions local.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@

app = create_app(debug=False, local=True)

# if __name__ == "__main__":
# socketio.run(app)
if __name__ == "__main__":
socketio.run(app)

0 comments on commit 2fe8295

Please sign in to comment.