add cdn option to change cdn service

rakeshmukundan · Apr 3, 2014 · adc7a7f · adc7a7f
1 parent 2cc6383
commit adc7a7f
Show file tree

Hide file tree

Showing 5 changed files with 40 additions and 21 deletions.
diff --git a/logging.conf b/logging.conf
@@ -2,6 +2,7 @@
 keys=root,scheduler,fetcher,processor,webui
 
 [logger_root]
+level=INFO
 handlers=screen
 
 [logger_scheduler]

diff --git a/run.py b/run.py
@@ -63,6 +63,7 @@ def run_webui():
     app.config['fetch'] = lambda task: pickle.loads(fetch_rpc.fetch(task).data)
     app.config['projectdb'] = get_projectdb
     app.config['scheduler_rpc'] = scheduler_rpc
+    #app.config['cdn'] = '//cdnjs.cloudflare.com/ajax/libs/'
     app.run()
 
 if __name__ == '__main__':

diff --git a/webui/app.py b/webui/app.py
@@ -6,8 +6,24 @@
 # Created on 2014-02-22 23:17:13
 
 import os
+import sys
+import urlparse
 from flask import Flask
 
 app = Flask('webui',
         static_folder=os.path.join(os.path.dirname(__file__), 'static'),
         template_folder=os.path.join(os.path.dirname(__file__), 'templates'))
+
+def cdn_url_handler(error, endpoint, kwargs):
+    if endpoint == 'cdn':
+        path = kwargs.pop('path')
+        cdn = app.config.get('cdn', 'http://cdn.staticfile.org/')
+        return urlparse.urljoin(cdn, path)
+    else:
+        exc_type, exc_value, tb = sys.exc_info()
+        if exc_value is error:
+            raise exc_type, exc_value, tb
+        else:
+            raise error
+
+app.handle_url_build_error = cdn_url_handler
diff --git a/webui/templates/debug.html b/webui/templates/debug.html
@@ -10,24 +10,24 @@
     <meta name="description" content="pyspider - debugger">
     <meta name="author" content="binux">
 
-    <link href="http://cdn.staticfile.org/codemirror/3.22.0/codemirror.min.css" rel="stylesheet">
-    <link href="http://cdn.staticfile.org/font-awesome/4.0.3/css/font-awesome.min.css" rel="stylesheet">
-    <link href="http://cdn.staticfile.org/codemirror/3.22.0/addon/dialog/dialog.min.css" rel="stylesheet">
+    <link href="{{ url_for('cdn', path='codemirror/3.22.0/codemirror.min.css') }}" rel="stylesheet">
+    <link href="{{ url_for('cdn', path='font-awesome/4.0.3/css/font-awesome.min.css') }}" rel="stylesheet">
+    <link href="{{ url_for('cdn', path='codemirror/3.22.0/addon/dialog/dialog.min.css') }}" rel="stylesheet">
     <link href="{{ url_for('static', filename='debug.css') }}" rel="stylesheet">
 
-    <script src="http://cdn.staticfile.org/jquery/1.11.0/jquery.min.js"></script>
-    <script src="http://cdn.staticfile.org/codemirror/3.22.0/codemirror.min.js"></script>
-    <script src="http://cdn.staticfile.org/codemirror/3.22.0/mode/xml/xml.min.js"></script>
-    <script src="http://cdn.staticfile.org/codemirror/3.22.0/mode/css/css.min.js"></script>
-    <script src="http://cdn.staticfile.org/codemirror/3.22.0/mode/javascript/javascript.min.js"></script>
-    <script src="http://cdn.staticfile.org/codemirror/3.22.0/mode/htmlmixed/htmlmixed.min.js"></script>
-    <script src="http://cdn.staticfile.org/codemirror/3.22.0/mode/python/python.min.js"></script>
-    <script src="http://cdn.staticfile.org/codemirror/3.22.0/addon/search/search.min.js"></script>
-    <script src="http://cdn.staticfile.org/codemirror/3.22.0/addon/search/searchcursor.min.js"></script>
-    <script src="http://cdn.staticfile.org/codemirror/3.22.0/addon/dialog/dialog.min.js"></script>
-    <script src="http://cdn.staticfile.org/codemirror/3.22.0/addon/selection/active-line.min.js"></script>
-    <script src="http://cdn.staticfile.org/codemirror/3.22.0/addon/runmode/runmode.min.js"></script>
-    <script src="http://cdn.staticfile.org/codemirror/2.36.0/formatting.min.js"></script>
+    <script src="{{ url_for('cdn', path='jquery/1.11.0/jquery.min.js') }}"></script>
+    <script src="{{ url_for('cdn', path='codemirror/3.22.0/codemirror.min.js') }}"></script>
+    <script src="{{ url_for('cdn', path='codemirror/3.22.0/mode/xml/xml.min.js') }}"></script>
+    <script src="{{ url_for('cdn', path='codemirror/3.22.0/mode/css/css.min.js') }}"></script>
+    <script src="{{ url_for('cdn', path='codemirror/3.22.0/mode/javascript/javascript.min.js') }}"></script>
+    <script src="{{ url_for('cdn', path='codemirror/3.22.0/mode/htmlmixed/htmlmixed.min.js') }}"></script>
+    <script src="{{ url_for('cdn', path='codemirror/3.22.0/mode/python/python.min.js') }}"></script>
+    <script src="{{ url_for('cdn', path='codemirror/3.22.0/addon/search/search.min.js') }}"></script>
+    <script src="{{ url_for('cdn', path='codemirror/3.22.0/addon/search/searchcursor.min.js') }}"></script>
+    <script src="{{ url_for('cdn', path='codemirror/3.22.0/addon/dialog/dialog.min.js') }}"></script>
+    <script src="{{ url_for('cdn', path='codemirror/3.22.0/addon/selection/active-line.min.js') }}"></script>
+    <script src="{{ url_for('cdn', path='codemirror/3.22.0/addon/runmode/runmode.min.js') }}"></script>
+    <script src="{{ url_for('cdn', path='codemirror/2.36.0/formatting.min.js') }}"></script>
   </head>
 
   <body>

diff --git a/webui/templates/index.html b/webui/templates/index.html
@@ -9,9 +9,13 @@
 
     <meta name="description" content="pyspider dashboard">
     <meta name="author" content="binux">
-    <link href="http://cdn.staticfile.org/twitter-bootstrap/3.1.1/css/bootstrap.min.css" rel="stylesheet">
-    <link href="http://cdn.staticfile.org/x-editable/1.5.0/bootstrap3-editable/css/bootstrap-editable.css" rel="stylesheet">
+    <link href="{{ url_for('cdn', path='twitter-bootstrap/3.1.1/css/bootstrap.min.css') }}" rel="stylesheet">
+    <link href="{{ url_for('cdn', path='x-editable/1.5.0/bootstrap3-editable/css/bootstrap-editable.css') }}" rel="stylesheet">
     <link href="{{ url_for('static', filename='index.css') }}" rel="stylesheet">
+
+    <script src="{{ url_for('cdn', path='jquery/1.11.0/jquery.min.js') }}"></script>
+    <script src="{{ url_for('cdn', path='twitter-bootstrap/3.1.1/js/bootstrap.min.js') }}"></script>
+    <script src="{{ url_for('cdn', path='x-editable/1.5.0/bootstrap3-editable/js/bootstrap-editable.min.js') }}"></script>
   </head>
 
   <body>
@@ -80,9 +84,6 @@
         </tbody>
       </table>
     </section>
-    <script src="http://cdn.staticfile.org/jquery/1.11.0/jquery.min.js"></script>
-    <script src="http://cdn.staticfile.org/twitter-bootstrap/3.1.1/js/bootstrap.min.js"></script>
-    <script src="http://cdn.staticfile.org/x-editable/1.5.0/bootstrap3-editable/js/bootstrap-editable.min.js"></script>
     <script src="{{ url_for('static', filename='index.js') }}"></script>
   </body>
 </html>