Merge branch 'master' of https://github.com/RuudBurger/CouchPotatoServer

couchpotato/core/logger.py

@@ -48,7 +48,7 @@ class CPLog(object):
                 else:
                     msg = msg % ss(replace_tuple)
             except:
-                self.error('Failed encoding stuff to log: %s' % traceback.format_exc())
+                self.logger.error(u'Failed encoding stuff to log: %s' % traceback.format_exc())
 
         if not Env.get('dev'):
 

couchpotato/core/plugins/log/main.py

@@ -73,7 +73,7 @@ class Logging(Plugin):
 
         return jsonified({
             'success': True,
-            'log': log,
+            'log': toUnicode(log),
             'total': total,
         })
 

couchpotato/core/plugins/log/static/log.css

@@ -59,6 +59,7 @@
 		width: 14%;
 		color: lightgrey;
 		padding: 3px 0;
+		font-size: 10px;
 	}
 
 	.page.log .container .time:last-child { display: none; }