Changeset 1317:b0da263525fc

Timestamp:

07/16/09 23:49:33 (3 years ago)

Author:

s0undt3ch

Branch:

default

Message:

logging module checkpoint. Will revert back to yeild'ing.

Location:

zine

Files:

• templates/admin/perform_upgrade.html (modified) (4 diffs)
• templates/upgrade_maintenance.html (added)
• upgrades/__init__.py (modified) (1 diff)
• upgrades/loggers.py (modified) (3 diffs)
• upgrades/webapp.py (modified) (5 diffs)

zine/templates/admin/perform_upgrade.html

@@ -72 +72 @@
       font-family: 'Consolas', 'Bitstream Vera Sans Mono', 'Monaco', monospace;
     }
-
   </style>
+  <script type="text/javascript" src="{{ jquery_url }}"></script>
 </head>
 
@@ -82 +82 @@
       <p>{% trans %}<b>Database upgrade in progress!</b>{% endtrans %}</p>
     {% elif live_log is defined %}
+
       <h1>{{ _("Upgrading...") }}</h1>
       <p>{% trans %}Upgrade in process.
         <strong>Don't hit cancel!</strong>{% endtrans %}</p>
-      {%- for event in live_log %}{{ event }}{%- endfor %}
-      <p>{% trans %}Database upgraded successfully.{% endtrans %}</p>
-      <br/>
-      <div class="message">{% trans %}Zine is in maintenance mode.
+      <div id="livelog"><div/>
+      <div class="message" style="display: none;">{% trans %}Zine is in maintenance mode.
           Please <a href="{{ blog_url }}">check your blog</a> to see if the
           upgrade was perfect.
@@ -94 +93 @@
           once you finish.
       {% endtrans %}</div>
-      {{ finish() }}
+      <script type="text/javascript">
+        jQuery(document).ready( function() {
+          function appendData(data) {
+            jQuery("#livelog").append(data)
+          }
+          jQuery.post('/', {}, appendData, 'html');
+        });
+      </script>
     {% else %}
       <h1>{{ _("Upgrade") }}</h1>
@@ -101 +107 @@
       <form action="" method="POST">
         <input type="submit" name="upgrade" value="Upgrade!">
+        <input type="button" id="upgrade" name="upgrade_" value="Upgrade!!">
       </form>
+      <div id="livelog"><div/>
+      <script type="text/javascript">
+        jQuery(document).ready( function() {
+          function appendData(data) {
+            jQuery("#livelog").append(data)
+          }
+          jQuery("#upgrade").click( function() {
+            jQuery.post('{{ upgrade_url }}', {}, appendData, 'html');
+          });
+        });
+      </script>
     {%- endif %}
   </div>

zine/upgrades/__init__.py

@@ -58 +58 @@
         root_logger = logging.getLogger()
         root_logger.setLevel(logging.DEBUG)
-        handler = loggers.LogHandler(sys.stdout)
+        handler = loggers.CliLogHandler(sys.stdout)
         handler.setFormatter(loggers.LogFormatter("%(message)s"))
         root_logger.addHandler(handler)

zine/upgrades/loggers.py

@@ -12 +12 @@
 import types
 import logging
+from logging.handlers import BufferingHandler
 
 def getTerminalSize():
@@ -73 +74 @@
         return s
 
-class LogHandler(logging.StreamHandler):
+class CliLogHandler(logging.StreamHandler):
     def emit(self, record):
         """
@@ -101 +102 @@
             self.handleError(record)
 
+class WebLogHandler(BufferingHandler):
+    def __init__(self):
+        BufferingHandler.__init__(self, -1)
+
+    def shouldFlush(self, record):
+        # We force it to never flush. We'll explicitly do the flushing
+        return (len(self.buffer) < self.capacity)

zine/upgrades/webapp.py

@@ -10 +10 @@
     :license: BSD, see LICENSE for more details.
 """
+# http://github.com/darwin/firelogger
+# http://github.com/darwin/firepython
 
+import logging
+import simplejson
 from os import remove
 from os.path import isfile
 from time import time
+from threading import Thread
+from uuid import uuid4
 from sqlalchemy.sql import and_
 from zine.database import db, privileges, users, user_privileges
+from zine.environment import SHARED_DATA
 from zine.i18n import load_core_translations
-from zine.upgrades import ManageDatabase
+from zine.upgrades import ManageDatabase, loggers
 from zine.utils.crypto import check_pwhash
+
+from werkzeug import SharedDataMiddleware
 from werkzeug.utils import redirect
 from werkzeug.contrib.securecookie import SecureCookie
@@ -41 +50 @@
         self.database_engine = app.database_engine
         self.lockfile = app.upgrade_lockfile
+#        self.jquery_url = app.url_adapter.build('core/shared',
+#                                                {'filename': 'js/jQuery.js'})
         self.blog_url = app.url_adapter.build('blog/index')
         self.login_url = app.url_adapter.build('account/login')
         self.maintenance_url = app.url_adapter.build('admin/maintenance')
+
+        self.jquery_url = '/shared/js/jQuery.js'
+        self.logging_url = '/livelog'
+        self.upgrade_url = '/upgrade/%s' % uuid4().hex
+        self.who_is_upgrading = None
+
+        # Setup logging
+        root_logger = logging.getLogger()
+        root_logger.setLevel(logging.DEBUG)
+        handler = loggers.WebLogHandler()
+        handler.setFormatter(loggers.LogFormatter("%(message)s"))
+        root_logger.addHandler(handler)
+        self.log_handler = handler
+        import sys
+        handler = loggers.CliLogHandler(sys.stdout)
+        handler.setFormatter(loggers.LogFormatter("%(message)s"))
+        root_logger.addHandler(handler)
+#        self.__call__ = SharedDataMiddleware(self.__call__, {'/shared': SHARED_DATA})
+
 
     def __getattr__(self, name):
@@ -79 +109 @@
 
     def dispatch(self, request):
-        if request.path not in ('/', self.login_url):
+        print request.path, self.jquery_url, self.jquery_url == request.path, SHARED_DATA
+        if request.path not in ('/', self.logging_url, self.login_url,
+                                self.jquery_url, self.upgrade_url):
             return redirect('')
 
@@ -97 +129 @@
                         request.is_somebody = True
                         return redirect('')
-
             response = Response()
             response.www_authenticate.set_basic()
@@ -110 +141 @@
 
         if request.method == 'POST':
-            open(self.lockfile, 'w').write('locked on database upgrade\n')
-            mdb = ManageDatabase(request.app)
-            db.session.close()  # Close open sessions
-            def finish():
-                # this runs after the upgrade finishes
-                remove(self.lockfile)
+            if request.path == self.upgrade_url:
+                mdb = ManageDatabase(request.app)
+                Thread(target=mdb.cmd_upgrade, args=(), kwargs={}).start()
+                while 1:
+                    response = Response('1' + ''.join(self.log_handler.buffer)
+#                                        , _stream=True
+                                        )
+                    self.log_handler.flush()
+            else:
+                open(self.lockfile, 'w').write('locked on database upgrade\n')
+                mdb = ManageDatabase(request.app)
                 db.session.close()  # Close open sessions
-                self.wants_reload = True    # Force application reload
-                return ''   # just because I need to return something to jinja
+                def finish():
+                    # this runs after the upgrade finishes
+                    remove(self.lockfile)
+                    db.session.close()  # Close open sessions
+                    self.wants_reload = True    # Force application reload
+                    return ''   # just because I need to return something to jinja
 
-            return render_response(request, 'admin/perform_upgrade.html',
-                                   live_log=mdb.cmd_upgrade(), _stream=True,
-                                   finish=finish, blog_url=self.blog_url,
-                                   maintenance_url=self.maintenance_url,
-                                   in_progress=False)
+                def start_upgrade():
+                    mdb.cmd_upgrade()
+                    return True
+
+                response = render_response(request,
+                    'admin/perform_upgrade.html', live_log=start_upgrade() and True or False,
+                    finish=finish, blog_url=self.blog_url,
+                    maintenance_url=self.maintenance_url,
+                    logging_url=self.logging_url, in_progress=False,
+                    jquery_url=self.jquery_url)
+            return response
 
         return render_response(request, 'admin/perform_upgrade.html',
-                               in_progress=isfile(self.lockfile))
+                               in_progress=isfile(self.lockfile),
+                               jquery_url=self.jquery_url,
+                               upgrade_url=self.upgrade_url)
 
     def __call__(self, environ, start_response):
         request = self.get_request(environ)
+        if request.path == self.jquery_url:
+            return SharedDataMiddleware(self, {'/shared': SHARED_DATA})(environ, start_response)
         response = self.dispatch(request)
         if request.session.should_save: