Some more logging for SABNZBd
This commit is contained in:
1 parent
9dc1843f25
commit
907f821e50
1 file changed
+10
-8
@@ -2,6 +2,7 @@ from couchpotato.core.downloaders.base import Downloader
|
|||||||
from couchpotato.core.helpers.encoding import tryUrlencode
|
from couchpotato.core.helpers.encoding import tryUrlencode
|
||||||
from couchpotato.core.helpers.variable import cleanHost, mergeDicts
|
from couchpotato.core.helpers.variable import cleanHost, mergeDicts
|
||||||
from couchpotato.core.logger import CPLog
|
from couchpotato.core.logger import CPLog
|
||||||
|
from urllib2 import URLError
|
||||||
import json
|
import json
|
||||||
import traceback
|
import traceback
|
||||||
|
|
||||||
@@ -43,8 +44,11 @@ class Sabnzbd(Downloader):
|
|||||||
sab = self.urlopen(url, timeout = 60, params = {"nzbfile": (nzb_filename, filedata)}, multipart = True, show_error = False)
|
sab = self.urlopen(url, timeout = 60, params = {"nzbfile": (nzb_filename, filedata)}, multipart = True, show_error = False)
|
||||||
else:
|
else:
|
||||||
sab = self.urlopen(url, timeout = 60, show_error = False)
|
sab = self.urlopen(url, timeout = 60, show_error = False)
|
||||||
|
except URLError:
|
||||||
|
log.error('Failed sending release, probably wrong HOST: %s', traceback.format_exc(0))
|
||||||
|
return False
|
||||||
except:
|
except:
|
||||||
log.error('Failed sending release: %s', traceback.format_exc())
|
log.error('Failed sending release, use API key, NOT the NZB key: %s', traceback.format_exc(0))
|
||||||
return False
|
return False
|
||||||
|
|
||||||
result = sab.strip()
|
result = sab.strip()
|
||||||
@@ -53,14 +57,12 @@ class Sabnzbd(Downloader):
|
|||||||
return False
|
return False
|
||||||
|
|
||||||
log.debug("Result text from SAB: " + result[:40])
|
log.debug("Result text from SAB: " + result[:40])
|
||||||
|
print result
|
||||||
if result == "ok":
|
if result == "ok":
|
||||||
log.info("NZB sent to SAB successfully.")
|
log.info("NZB sent to SAB successfully.")
|
||||||
return True
|
return True
|
||||||
elif result == "Missing authentication":
|
|
||||||
log.error("Incorrect username/password.")
|
|
||||||
return False
|
|
||||||
else:
|
else:
|
||||||
log.error("Unknown error: " + result[:40])
|
log.error(result[:40])
|
||||||
return False
|
return False
|
||||||
|
|
||||||
def getAllDownloadStatus(self):
|
def getAllDownloadStatus(self):
|
||||||
@@ -75,7 +77,7 @@ class Sabnzbd(Downloader):
|
|||||||
'mode': 'queue',
|
'mode': 'queue',
|
||||||
})
|
})
|
||||||
except:
|
except:
|
||||||
log.error('Failed getting queue: %s', traceback.format_exc())
|
log.error('Failed getting queue: %s', traceback.format_exc(0))
|
||||||
return False
|
return False
|
||||||
|
|
||||||
# Go through history items
|
# Go through history items
|
||||||
@@ -85,7 +87,7 @@ class Sabnzbd(Downloader):
|
|||||||
'limit': 15,
|
'limit': 15,
|
||||||
})
|
})
|
||||||
except:
|
except:
|
||||||
log.error('Failed getting history json: %s', traceback.format_exc())
|
log.error('Failed getting history json: %s', traceback.format_exc(0))
|
||||||
return False
|
return False
|
||||||
|
|
||||||
statuses = []
|
statuses = []
|
||||||
@@ -134,7 +136,7 @@ class Sabnzbd(Downloader):
|
|||||||
'value': item['id']
|
'value': item['id']
|
||||||
}, use_json = False)
|
}, use_json = False)
|
||||||
except:
|
except:
|
||||||
log.error('Failed deleting: %s', traceback.format_exc())
|
log.error('Failed deleting: %s', traceback.format_exc(0))
|
||||||
return False
|
return False
|
||||||
|
|
||||||
return True
|
return True
|
||||||
|
|||||||
Reference in new issue
Block a user