[Pkg-debile-commits] [debile-web] 01/01: Do not try to initialize fedmsg

[Jon Severinsson]

This is an automated email from the git hooks/post-receive script.

jonno-guest pushed a commit to branch master
in repository debile-web.

commit dc1ede44d0f1ad71441af824ace87e6b2ed0e9d8
Author: Jon Severinsson <jon at severinsson.net>
Date:   Tue May 6 19:00:56 2014 +0200

    Do not try to initialize fedmsg
---
 app.py  |  7 +++----
 wsgi.py | 12 ++++++------
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/app.py b/app.py
old mode 100644
new mode 100755
index 73ab683..2276171
--- a/app.py
+++ b/app.py
@@ -19,15 +19,14 @@
 # DEALINGS IN THE SOFTWARE.
 
 from flask import Flask
-from debileweb.blueprints.frontend import frontend
-
 from debile.master.utils import init_master
+from debileweb.blueprints.frontend import frontend
 
-app = Flask(__name__)
+app = Flask("debile-web")
 app.config.from_object('config')
 app.register_blueprint(frontend)
 
 
 if __name__ == '__main__':
-    init_master()
+    init_master(fedmsg=False)
     app.run(debug=False)
diff --git a/wsgi.py b/wsgi.py
index 5e21814..5762182 100644
--- a/wsgi.py
+++ b/wsgi.py
@@ -18,11 +18,11 @@
 # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 # DEALINGS IN THE SOFTWARE.
 
-from app import app
+from flask import Flask
 from debile.master.utils import init_master
+from debileweb.blueprints.frontend import frontend
 
-# needs to be called unconditionally
-init_master()
-
-if __name__ == "__main__":
-    app.run()
+app = Flask("debile-web")
+app.config.from_object('config')
+app.register_blueprint(frontend)
+init_master(fedmsg=False)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-debile/debile-web.git