From debd7ed59e445243316c32e2fed94cee85702f35 Mon Sep 17 00:00:00 2001
From: "xueming.li" <xueming.li@dianping.com>
Date: Thu, 10 Jan 2013 11:15:46 +0800
Subject: [PATCH 1/3] add init_app method

---
 flask_celery.py | 24 ++++++++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

diff --git a/flask_celery.py b/flask_celery.py
index 2f9a85d..2dfeb66 100644
--- a/flask_celery.py
+++ b/flask_celery.py
@@ -17,7 +17,7 @@
 from celery.loaders import default as _default
 from celery.utils import get_full_cls_name
 
-from werkzeug import cached_property
+from werkzeug.utils import cached_property
 
 from flask.ext import script
 
@@ -25,9 +25,13 @@
 class FlaskLoader(_default.Loader):
 
     def read_configuration(self):
-        config = self.app.flask_app.config
-        settings = self.setup_settings(config)
-        self.configured = True
+        try:
+            config = self.app.flask_app.config
+            settings = self.setup_settings(config)
+            self.configured = True
+        except AttributeError:
+            settings = dict()
+            self.configured = False
         return settings
 
 
@@ -51,6 +55,14 @@ def __init__(self, flask_app=None, *args, **kwargs):
     def __reduce_args__(self):
         return (self.flask_app, ) + super(Celery, self).__reduce_args__()
 
+    def init_app(self, app, config=None):
+        self.flask_app = app
+        if config is not None:
+            self.conf.update(config)
+        else:
+            self.conf.update(app.config)
+        self.configured = True
+
 
 
 def to_Option(option, typemap={"int": int, "float": float, "string": str}):
@@ -111,6 +123,10 @@ def run(self, **kwargs):
     @cached_property
     def worker(self):
         from celery.bin.celeryd import WorkerCommand
+        app = current_celery()
+        import pprint
+        pprint.pprint(app.conf)
+        print app.conf.CELERY_RESULT_BACKEND
         return WorkerCommand(app=current_celery())
 
 

From 5b8f753248c6ac23fd3855d68e3a3acb39262653 Mon Sep 17 00:00:00 2001
From: "xueming.li" <xueming.li@dianping.com>
Date: Thu, 21 Mar 2013 13:09:44 +0800
Subject: [PATCH 2/3] add init_app factory method

---
 .gitignore      | 1 +
 flask_celery.py | 3 ---
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index da69b8a..4b46767 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,3 +15,4 @@ erl_crash.dump
 *.db
 Documentation/
 .tox/
+.idea/
diff --git a/flask_celery.py b/flask_celery.py
index 2dfeb66..09f066d 100644
--- a/flask_celery.py
+++ b/flask_celery.py
@@ -124,9 +124,6 @@ def run(self, **kwargs):
     def worker(self):
         from celery.bin.celeryd import WorkerCommand
         app = current_celery()
-        import pprint
-        pprint.pprint(app.conf)
-        print app.conf.CELERY_RESULT_BACKEND
         return WorkerCommand(app=current_celery())
 
 

From 82c69d412413d7027fc302558a97bb8a66840425 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=20=E5=AD=A6=E6=98=8E?= <xueming.li@dianping.com>
Date: Wed, 17 Apr 2013 17:09:10 +0800
Subject: [PATCH 3/3] Merge branch 'logscan'

Conflicts:
	cuttlefish/lib/cmdb.py
	cuttlefish/static/js/cmdb-device.js
	cuttlefish/templates/cmdb/device.html
	cuttlefish/views/cmdb.py
---
 flask_celery.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/flask_celery.py b/flask_celery.py
index 09f066d..1fd7887 100644
--- a/flask_celery.py
+++ b/flask_celery.py
@@ -61,6 +61,7 @@ def init_app(self, app, config=None):
             self.conf.update(config)
         else:
             self.conf.update(app.config)
+        print self.conf
         self.configured = True