Merge branch 'hotfix-0.3.2'

Author: bbengfort

baleen/models.py

@@ -23,6 +23,8 @@
 
 from datetime import datetime
 from baleen.config import settings
+from baleen.utils.timez import humanizedelta
+
 
 ##########################################################################
 ## Module Constants
@@ -174,9 +176,62 @@ def pre_save(cls, sender, document, **kwargs):
         'collection': 'jobs',
     }
 
+    def duration(self, humanize=False):
+        """
+        Returns the timedelta of the duration.
+        """
+        finished = self.finished or datetime.now()
+        delta = finished - self.started
+
+        if humanize:
+            return humanizedelta(
+                days=delta.days,
+                seconds=delta.seconds,
+                microseconds=delta.microseconds
+            )
+        return delta
+
     def __unicode__(self):
         return "{} Job {}".format(self.name, self.jobid)
 
+
+class Log(me.DynamicDocument):
+
+    level     = me.DictField()
+    message   = me.StringField(max_length=4096)
+    host      = me.StringField(max_length=255)
+    user      = me.StringField(max_length=255)
+    error     = me.DictField()
+    logger    = me.StringField(max_length=255)
+    asctime   = me.StringField(max_length=64)
+    timestamp = me.DateTimeField()
+
+    meta      = {
+        'collection': 'logs',
+    }
+
+    @property
+    def bootstrap_class(self):
+        """
+        Uses the log level to determine the bootstrap class.
+        """
+        levels = {
+            "DEBUG": "success",
+            "INFO": "info",
+            "WARNING": "warning",
+            "WARN": "warning",
+            "ERROR": "danger",
+            "CRITICAL": "danger",
+        }
+
+        key = self.level.get('name')
+        if key and key in levels:
+            return levels[key]
+        return ""
+
+    def __unicode__(self):
+        return self.message
+
 ##########################################################################
 ## Signals
 ##########################################################################

baleen/version.py

@@ -20,7 +20,7 @@
 __version_info__ = {
     'major': 0,
     'minor': 3,
-    'micro': 1,
+    'micro': 2,
     'releaselevel': 'final',
     'serial': 0,
 }

baleen/www/app.py

@@ -18,79 +18,122 @@
 ##########################################################################
 
 import os
-import codecs
-import datetime
 import baleen
-import baleen.models as db
 
-from itertools import islice
-from flask import Flask, render_template
 from baleen.config import settings
+from baleen.models import Feed, Post, Job, Log
+from baleen.utils.timez import HUMAN_DATETIME
 
+from flask import Flask, render_template, request
+from flask.ext.mongoengine import MongoEngine
+from flask_humanize import Humanize
 
 ##########################################################################
 ## Flask Application
 ##########################################################################
 
 # set up an app instance
 app = Flask(__name__)
+
 # set debug to true to get debug pages when there is an error
 app.debug = settings.debug
 
+# configure the app with the confire settings
+app.config['MONGODB_SETTINGS'] = {
+    'db':   settings.database.name,
+    'host': settings.database.host,
+    'port': settings.database.port,
+}
+
+# connect to the database using the Flask extension
+db = MongoEngine(app)
+
+# add the humanize extension
+humanize = Humanize(app)
 
 ##########################################################################
 ## Routes
 ##########################################################################
 
 @app.route("/")
 def index():
-    # connect to the database
-    db.connect()
+    """
+    Displays an index page with the feed listing
+    """
     # get all the stuff we want
-    feeds = db.Feed.objects()
+    feeds = Feed.objects()
     feed_count = feeds.count()
-    topics = set([feed.category for feed in db.Feed.objects.only('category')])
+    topics = set([feed.category for feed in Feed.objects.only('category')])
     feeds_topics_counts = len(topics)
     feeds_topics = {
-        topic: db.Feed.objects(category=topic)
+        topic: Feed.objects(category=topic)
         for topic in topics
     }
 
     # load all the data into the templates/feed_list.html template
-    return render_template('feed_list.html',
+    return render_template('index.html',
                            feeds=feeds,
                            feeds_topics=feeds_topics,
                            feed_count=feed_count,
                            topic_count=feeds_topics_counts)
 
-def get_logs():
-    infile = settings.logfile
-    file = reversed(list(codecs.open(infile,'r',encoding='utf8')))
-    logitems = islice(file,20)
-    return logitems
 
 @app.route("/status/")
-def latest_job():
-    # get the last job executed
-    db.connect()
+def status():
+    """
+    Displays the current Baleen status and job listing
+    """
     version = baleen.get_version()
-    counts = [db.Feed.objects.count(),db.Post.objects.count(),db.Job.objects.count()]
-    latest_job = db.Job.objects.order_by('-started').first()
-    latest_feed = db.Feed.objects.order_by('-updated').first()
-    latest_post = db.Post.objects.order_by('-id').first()
-    td = datetime.datetime.now() - latest_job.started
-    running_time = str(td)
-    logitems = get_logs()
+    counts = {
+        'feeds': Feed.objects.count(),
+        'posts': Post.objects.count(),
+        'jobs':  Job.objects.count(),
+    }
+    latest_job = Job.objects.order_by('-started').first()
+    latest_feed = Feed.objects.order_by('-updated').first()
+    latest_post = Post.objects.order_by('-id').first()
 
     # load all data into job_status template
-    return render_template('job_status.html',
+    return render_template('status.html',
                            latest_job=latest_job,
                            latest_feed=latest_feed,
                            latest_post=latest_post,
                            version=version,
                            counts=counts,
-                           running_time=running_time,
-                           logitems=logitems)
+                           dtfmt=HUMAN_DATETIME,
+                           recent_jobs=Job.objects.order_by('-started').limit(10))
+
+
+@app.route("/logs/")
+def logs():
+    """
+    Displays log records from the Mongo Database.
+    This is paginated and allows flexible per-page counts (max 200 record).
+    """
+    # Get pagination information for request
+    page = int(request.args.get('page', 1))
+    per_page = min(int(request.args.get('per_page', 50)), 200)
+
+    # Compute the pagination variables
+    n_logs   = Log.objects.count()
+    n_pages  = (n_logs + per_page // 2) // per_page
+    nextp    = page + 1 if page + 1 <= n_pages else None
+    prevp    = page - 1 if page > 1 else None
+
+    # Perform query
+    offset   = (page - 1) * per_page
+    logs     = Log.objects.order_by('-id').skip(offset).limit(per_page)
+
+    return render_template(
+        'logs.html',
+        page = page,
+        num_pages = n_pages,
+        per_page  = per_page,
+        logs = logs,
+        num_logs = n_logs,
+        next = nextp,
+        prev = prevp,
+    )
 
 
 ##########################################################################

baleen/www/templates/components/navbar.html

@@ -26,6 +26,12 @@
           Status
         </a>
       </li>
+      <li>
+        <a href="/logs/">
+          <i class="fa fa-book"></i>
+          Logs
+        </a>
+      </li>
      </ul>
 
      <ul class="nav navbar-nav navbar-right">

baleen/www/templates/feed_list.html baleen/www/templates/index.htmlbaleen/www/templates/feed_list.html renamed to baleen/www/templates/index.html

@@ -0,0 +1,48 @@
+{% extends 'base.html' %}
+{% block title %}Baleen Log Records{% endblock %}
+
+{% block body %}
+<div class="container">
+
+  <!-- Page Title -->
+  <div id="top" class="row">
+    <div class="col-xs-12">
+      <div class="page-header">
+        <h1>Log Records</h1>
+        <p class="text-muted">Page {{ page }} of {{ num_pages }} &middot; {{ num_logs|humanize('intcomma') }} log records</small>
+      </div>
+    </div>
+  </div>
+
+  <!-- Log table -->
+  <div class="row">
+    <div class="col-md-12">
+
+      <table class="table table-hover table-bordered">
+        <tbody>
+          {% for log in logs %}
+          <tr>
+            <td class="{{ log.bootstrap_class }}">{{ log.message }}</td>
+          </tr>
+          {% else %}
+          <tr>
+            <td>No log records yet</td>
+          </tr>
+          {% endfor %}
+        </tbody>
+      </table>
+
+      <nav>
+        <ul class="pager">
+          <li class="previous{% if not prev %} disabled{% endif %}"><a href="{% if prev %}/logs/?page={{ prev }}&per_page={{ per_page }}{% else %}#{% endif %}">
+            <span aria-hidden="true">&larr;</span> Newer
+          </a></li>
+          <li class="next{% if not next %} disabled{% endif %}"><a href="{% if next %}/logs/?page={{ next }}&per_page={{ per_page }}{% else %}#{% endif %}">
+            Older <span aria-hidden="true">&rarr;</span>
+          </a></li>
+        </ul>
+      </nav>
+    </div>
+  </div>
+
+{% endblock %}