Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Replace generic Exception with RequestException, demote to warning. F… #5386

Merged
merged 2 commits into from
Oct 11, 2018
Merged

Replace generic Exception with RequestException, demote to warning. F… #5386

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
51bd346
Replace generic Exception with RequestException, demote to warning. F…
medariox Oct 11, 2018
1e916f3
Update CHANGELOG.md
medariox Oct 11, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,9 @@
- Fixed adba lib trowing exceptions getting release groups for some anime shows ([#5125](https://github.com/pymedusa/Medusa/pull/5125))
- Fixed trakt icon not showing on the displayShow page, when a trakt id is available ([#5300](https://github.com/pymedusa/Medusa/pull/5300))
- Fixed editShow page crashing because of a memory overflow ([#5314](https://github.com/pymedusa/Medusa/pull/5314))
- Fix exception when downloading missed subtitles ([#5356](https://github.com/pymedusa/Medusa/pull/5356))
- Fix popularShows path on router ([#5356](https://github.com/pymedusa/Medusa/pull/5356))
- Fixed exception when downloading missed subtitles ([#5356](https://github.com/pymedusa/Medusa/pull/5356))
- Fixed popularShows path on router ([#5356](https://github.com/pymedusa/Medusa/pull/5356))
- Fixed imdbpie exception on connection error ([#5386](https://github.com/pymedusa/Medusa/pull/5386))

-----

Expand Down
10 changes: 6 additions & 4 deletions medusa/show_queue.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,8 @@
from medusa.logger.adapters.style import BraceAdapter
from medusa.tv import Series

from requests import RequestException

from six import binary_type, text_type, viewitems

from traktor import TraktException
Expand Down Expand Up @@ -587,8 +589,8 @@ def run(self):
self.show.load_imdb_info()
except ImdbAPIError as error:
log.info('Something wrong on IMDb api: {0}', error)
except Exception as error:
log.error('Error loading IMDb info: {0}', error)
except RequestException as error:
log.warning('Error loading IMDb info: {0}', error)

try:
self.show.save_to_db()
Expand Down Expand Up @@ -829,7 +831,7 @@ def run(self):
'{id}: Something wrong on IMDb api: {error_msg}',
{'id': self.show.series_id, 'error_msg': error}
)
except Exception as error:
except RequestException as error:
log.warning(
'{id}: Error loading IMDb info: {error_msg}',
{'id': self.show.series_id, 'error_msg': error}
Expand Down Expand Up @@ -994,7 +996,7 @@ def run(self):
'{id}: Something wrong on IMDb api: {error_msg}',
{'id': self.show.series_id, 'error_msg': error}
)
except Exception as error:
except RequestException as error:
log.warning(
'{id}: Error loading IMDb info: {error_msg}',
{'id': self.show.series_id, 'error_msg': error}
Expand Down