使用 python-decouple 加载配置等

.editorconfig

@@ -0,0 +1,25 @@
+# http://editorconfig.org
+
+root = true
+
+[*]
+charset = utf-8
+end_of_line = lf
+trim_trailing_whitespace = true
+insert_final_newline = true
+
+[*.py]
+indent_style = space
+indent_size = 4
+
+[*.{html,js,jsx,css,styl,yml}]
+indent_style = space
+indent_size = 2
+
+[*.html]
+language = mako
+
+[Vagrantfile]
+indent_style = space
+indent_size = 2
+language = ruby

.env.example

@@ -0,0 +1,14 @@
+FALCON_DEBUG=1
+FALCON_DB_HOST=localhost
+FALCON_DB_PORT=3306
+FALCON_DB_USER=root
+FALCON_DB_PASS=""
+FALCON_DB_NAME=falcon_portal
+FALCON_SECRET_KEY="4e.5tyg8-u9ioj"
+FALCON_SESSION_COOKIE_NAME="falcon-portal"
+FALCON_SERVER_NAME=
+FALCON_SESSION_LIFETIME=86400
+FALCON_NIC_INTERNAL=http://127.0.0.1:8080
+FALCON_NIC_EXTERNAL=http://11.11.11.11:8080
+FALCON_UIC_TOKEN=""
+FALCON_MAINTAINERS=root

.gitignore

@@ -49,4 +49,5 @@ docs/_build/
 /frame/local_config.py
 /falcon-portal*
 /gitversion
+.env
 

README.md

@@ -9,7 +9,7 @@ falcon portal
     $ virtualenv ./env
 
     # use douban pypi
-    $ ./env/bin/pip install -r pip_requirements.txt -i http://pypi.douban.com/simple
+    $ ./env/bin/pip install -r requirements.txt -i http://pypi.douban.com/simple
 
 
 ## Init database and config
@@ -19,16 +19,19 @@ falcon portal
 
 ## Start
 
-    $ ./env/bin/python wsgi.py
+    $ cp .env.example .env
+
+    $ . env/bin/activate
+    $ env `cat .env | xargs` python wsgi.py
 
     --> goto http://127.0.0.1:5050
 
 
 ## Run with gunicorn
 
     $ . env/bin/activate
-    $ bash run.sh
-    
+    $ env `cat .env 2>/dev/null | xargs` gunicorn -c gunicorn.conf wsgi:app
+
     --> goto http://127.0.0.1:5050
 
 

frame/api/uic.py

@@ -25,7 +25,7 @@ def username_from_sso(sig=''):
 
 
 def login_url(sig='', callback=''):
-    return '%s/auth/login?sig=%s&callback=%s' % (UIC_ADDRESS['external'], sig, callback)
+    return UIC_ADDRESS['login']
 
 
 def query_group(query='', limit=10):

frame/config.py

@@ -1,34 +1,56 @@
 # -*- coding:utf-8 -*-
-__author__ = 'Ulric Qin'
+__author__ = ['Ulric Qin', 'Eagle Liut']
+
+from decouple import config
 
 # -- app config --
-DEBUG = True
+DEBUG = config('FALCON_DEBUG', default=False, cast=bool)
 
 # -- db config --
-DB_HOST = "127.0.0.1"
-DB_PORT = 3306
-DB_USER = "root"
-DB_PASS = ""
-DB_NAME = "falcon_portal"
+
+DB_HOST = config('FALCON_PORTAL_DB_HOST', default="127.0.0.1")
+DB_PORT = config('FALCON_PORTAL_DB_PORT', default=3306, cast=int)
+DB_USER = config('FALCON_PORTAL_DB_USER', default="root")
+DB_PASS = config('FALCON_PORTAL_DB_PASS', default="password")
+DB_NAME = config('FALCON_PORTAL_DB_NAME', default="falcon_portal")
 
 # -- cookie config --
-SECRET_KEY = "4e.5tyg8-u9ioj"
-SESSION_COOKIE_NAME = "falcon-portal"
-PERMANENT_SESSION_LIFETIME = 3600 * 24 * 30
+SECRET_KEY = config('FALCON_SECRET_KEY', default="4e.5tyg8-u9ioj")
+SESSION_COOKIE_NAME = config('FALCON_SESSION_COOKIE_NAME', default="falcon-portal")
+SESSION_COOKIE_DOMAIN = config('FALCON_SESSION_COOKIE_DOMAIN', default=None)
+SERVER_NAME = config('FALCON_SERVER_NAME', default=None)
+PERMANENT_SESSION_LIFETIME = config('FALCON_SESSION_LIFETIME', default=86400, cast=int)
+
+URL_PORTAL = config('FALCON_URL_PORTAL', default="http://127.0.0.1:5050")
+URL_DARSHBOARD = config('FALCON_URL_DARSHBOARD', default="http://127.0.0.1:8081")
+URL_GRAFANA = config('FALCON_URL_GRAFANA', default="http://127.0.0.1:3000")
+URL_ALARM = config('FALCON_URL_ALARM', default="http://127.0.0.1:9912")
+URL_UIC = config('FALCON_URL_UIC', default="http://127.0.0.1:1234")
 
 UIC_ADDRESS = {
-    'internal': 'http://127.0.0.1:8080',
-    'external': 'http://11.11.11.11:8080',
+    'internal': config('FALCON_UIC_INTERNAL', default='http://127.0.0.1:1234'),
+    'external': config('FALCON_UIC_EXTERNAL', default=URL_UIC),
+    'login': config(
+        'FALCON_UIC_LOGIN',
+        default='{}/auth/login?callback={}'.format(URL_UIC, URL_PORTAL)),
 }
 
-UIC_TOKEN = ''
+UIC_TOKEN = config('FALCON_UIC_TOKEN', default='')
 
-MAINTAINERS = ['root']
-CONTACT = '[email protected]'
+MAINTAINERS = config('FALCON_MAINTAINERS', default='root').split(',')
+CONTACT = config('FALCON_CONTACT', default='[email protected]')
 
 COMMUNITY = True
 
+JSONCFG = {}
+JSONCFG['shortcut'] = {}
+JSONCFG['shortcut']['falconPortal'] = URL_PORTAL
+JSONCFG['shortcut']['falconDashboard'] = URL_DARSHBOARD
+JSONCFG['shortcut']['grafanaDashboard'] = URL_GRAFANA
+JSONCFG['shortcut']['falconAlarm'] = URL_ALARM
+JSONCFG['shortcut']['falconUIC'] = URL_UIC
+
 try:
     from frame.local_config import *
 except Exception, e:
-    print "[warning] %s" % e
+    print('level=warning msg="%s"' % e)

pip_requirements.txt → requirements.txt

@@ -4,3 +4,4 @@ Werkzeug==0.9.4
 gunicorn==19.3.0
 requests==2.3.0
 mysql-python
+python-decouple

web/__init__.py

@@ -11,9 +11,9 @@
 app.config.from_object("frame.config")
 
 # config log
-log_formatter = '%(asctime)s\t[%(filename)s:%(lineno)d] [%(levelname)s: %(message)s]'
+log_formatter = 'time="%(asctime)s" level=%(levelname)s msg="%(message)s"'
 log_level = logging.DEBUG if app.config['DEBUG'] else logging.WARNING
-logging.basicConfig(format=log_formatter, datefmt="%Y-%m-%d %H:%M:%S", level=log_level)
+logging.basicConfig(format=log_formatter, datefmt="%Y-%m-%dT%H:%M:%S%z", level=log_level)
 
 IGNORE_PREFIX = ['/api', '/static']
 
@@ -38,26 +38,17 @@ def before_request():
         if p.startswith(ignore_pre):
             return
 
-    if 'user_name' in session and session['user_name']:
-        g.user_name = session['user_name']
-    else:
-        sig = request.cookies.get('sig')
-        if not sig:
-            return redirect_to_sso()
-
+    sig = request.cookies.get('sig')
+    if not sig:
+        return redirect_to_sso()
+    elif 'user_name' not in g:
         username = uic.username_from_sso(sig)
-        if not username:
-            return redirect_to_sso()
-
-        session['user_name'] = username
-        g.user_name = session['user_name']
+        g.user_name = username
 
 
 def redirect_to_sso():
-    sig = uic.gen_sig()
-    resp = make_response(redirect(uic.login_url(sig, urllib.quote(request.url))))
-    resp.set_cookie('sig', sig)
+    resp = make_response(redirect(uic.login_url()))
     return resp
 
 
-from web.controller import home, group, plugin, host, expression, api, template, strategy, nodata, cluster
+from web.controller import home, group, plugin, host, expression, api, template, strategy, nodata, cluster

web/controller/api.py

@@ -11,6 +11,7 @@
 from web.model.expression import Expression
 from web.model.strategy import Strategy
 from frame import utils
+from frame import config
 
 
 @app.route('/api/version')
@@ -95,7 +96,7 @@ def api_pings_get():
 
 @app.route('/api/debug')
 def api_debug():
-    return render_template('debug/index.html')
+    return render_template('debug/index.html', config=config)
 
 
 @app.route('/api/group/<grp_name>/hosts.json')
@@ -109,4 +110,3 @@ def api_group_hosts_json(grp_name):
     vs, _ = Host.query(1, 10000000, '', '0', group.id)
     names = [v.hostname for v in vs]
     return jsonify(msg='', data=names)
-

web/controller/expression.py

@@ -6,6 +6,7 @@
 from web.model.action import Action
 from frame.params import required_chk
 from frame.config import UIC_ADDRESS
+from frame import config
 
 
 @app.route('/expressions')
@@ -28,7 +29,8 @@ def expressions_get():
             'limit': limit,
             'page': page,
             'mine': mine,
-        }
+        }, 
+        config=config
     )
 
 
@@ -46,8 +48,10 @@ def expression_add_get():
     o = Expression.get(int(request.args.get('id', '0').strip()))
     if o:
         a = Action.get(o.action_id)
-    return render_template('expression/add.html',
-                           data={'action': a, 'expression': o, 'uic_address': UIC_ADDRESS['external']})
+    return render_template(
+            'expression/add.html',
+            data={'action': a, 'expression': o, 'uic_address': UIC_ADDRESS['external']},
+            config=config)
 
 
 @app.route('/expression/update', methods=['POST'])
@@ -132,4 +136,7 @@ def expression_view_get(eid):
         a = Action.get(o.action_id)
     else:
         return 'no such expression'
-    return render_template('expression/view.html', data={'action': a, 'expression': o})
+    return render_template(
+            'expression/view.html', 
+            data={'action': a, 'expression': o},
+            config=config)

web/controller/fe_api.py

@@ -0,0 +1,34 @@
+import urllib2
+import urllib
+import logging
+import time
+
+log = logging.getLogger(__name__)
+def post2FeUpdateEventCase(url, data):
+    mtries, mdelay, backoff = 4, 3, 2
+    resp_code = 200
+    while mtries > 1:
+        try:
+            url_values = urllib.urlencode(data)
+            full_url = url + '?' + url_values
+            response = urllib2.urlopen(full_url)
+            resp_code = response.getcode()
+            mtries = 1
+        except urllib2.HTTPError as e:
+            msg = "%s, Retrying in %d seconds..." % (str(e),mdelay)
+            print('msg="%s"' % msg)
+            resp_code = e.code
+            time.sleep(mdelay)
+            mdelay *= backoff
+            mtries -= 1 
+        except Exception as e:
+            msg = "%s, Retrying in %d seconds..." % (str(e),mdelay)
+            print('msg="%s"' % msg)
+            log.warning(msg)
+            if mtries == 2:
+                resp_code = 500
+                log.error(str(e))
+            time.sleep(mdelay)
+            mdelay *= backoff
+            mtries -= 1 
+    return resp_code

web/controller/group.py

@@ -7,6 +7,7 @@
 from web.model.grp_tpl import GrpTpl
 from web.service import group_service
 from frame.config import UIC_ADDRESS
+from frame import config
 
 
 @app.route('/group/create', methods=['POST'])
@@ -55,7 +56,7 @@ def group_update_post(group_id):
 
 @app.route('/group/advanced')
 def group_advanced_get():
-    return render_template('group/advanced.html')
+    return render_template('group/advanced.html', config=config)
 
 
 @app.route('/group/rename', methods=['POST'])
@@ -77,7 +78,8 @@ def group_templates_get(grp_id):
 
     ts = GrpTpl.tpl_list(grp_id)
 
-    return render_template('group/templates.html', group=grp, ts=ts, uic_address=UIC_ADDRESS['external'])
+    return render_template('group/templates.html', group=grp, ts=ts, 
+                            uic_address=UIC_ADDRESS['external'], config=config)
 
 
 @app.route('/group/bind/template')
@@ -91,4 +93,4 @@ def group_bind_template_get():
         return jsonify(msg="grp id is blank")
 
     GrpTpl.bind(grp_id, tpl_id, g.user_name)
-    return jsonify(msg='')
+    return jsonify(msg='')

web/controller/home.py

@@ -26,6 +26,7 @@ def home_get():
             'mine': mine,
             'is_root': g.user_name in config.MAINTAINERS,
             'community': config.COMMUNITY,
-        }
+        },
+        config=config
     )