Revert "Merge branch 'refs/heads/develop' into desktop"

This reverts commit 66c6834b0c, reversing
changes made to f70767be28.
This commit is contained in:
Ruud
2012-01-14 11:58:40 +01:00
parent 478e729e73
commit c8a2df0f0c
4 changed files with 2 additions and 43 deletions
+1 -20
View File
@@ -1,5 +1,5 @@
from couchpotato.api import addApiView
from couchpotato.core.helpers.request import jsonified, getParam, getParams
from couchpotato.core.helpers.request import jsonified, getParam
from couchpotato.core.logger import CPLog
from couchpotato.core.plugins.base import Plugin
from couchpotato.environment import Env
@@ -14,7 +14,6 @@ class Logging(Plugin):
def __init__(self):
addApiView('logging.get', self.get)
addApiView('logging.clear', self.clear)
addApiView('logging.log', self.log)
def get(self):
@@ -68,21 +67,3 @@ class Logging(Plugin):
return jsonified({
'success': True
})
def log(self):
params = getParams()
try:
log_message = 'API log: %s' % params
try:
getattr(log, params.get('type', 'error'))(log_message)
except:
log.error(log_message)
except:
log.error('Couldn\'t log via API: %s' % params)
return jsonified({
'success': True
})