Merge remote-tracking branch 'origin/master'

wanikaniburned.py

@@ -2,6 +2,7 @@ import ujson as json
 import re
 from datetime import datetime, timedelta
 import logging
+import sys
 
 import flask
 from flask.ext.login import LoginManager, login_user, login_required, current_user, logout_user, login_fresh, \
@@ -14,11 +15,15 @@ from wtforms.validators import DataRequired
 
 logger = logging.getLogger(__name__)
 logger.setLevel(logging.INFO)
+console_handler = logging.StreamHandler(sys.stdout)
+console_handler.setLevel(logging.DEBUG)
 handler = logging.FileHandler('wkburned.log')
 handler.setLevel(logging.WARN)
 formatter = logging.Formatter('%(asctime)s - %(name)s - %(levelname)s - %(message)s')
 handler.setFormatter(formatter)
+console_handler.setFormatter(formatter)
 logger.addHandler(handler)
+logger.addHandler(console_handler)
 
 app = flask.Flask(__name__)
 logger.debug("Configuring application.")
@@ -118,11 +123,15 @@ class User(db.Model):
     def update_all(self):  # pragma: no cover
         logger.info("Updating all info for %s", self.api_key)
         if (datetime.utcnow() - self.last_updated) > timedelta(hours=1):
+            try:
                 self.parse_radicals_and_userdata()
                 self.parse_kanji()
                 self.parse_vocabulary()
                 self.last_updated = datetime.utcnow()
                 db.session.commit()
+            except requests.exceptions.SSLError:
+                logger.error("%s received an SSL error trying to update. Ensure SSL certs are installed.", self.api_key)
+                raise ValueError('Backend SSL Certificate Error, contact administrator.')
         else:
             logger.warn("%s tried to update too frequently", self.api_key)
             raise ValueError('Cannot refresh now, try again later.')