Commit a2e6f0e5 authored by echel0n's avatar echel0n
Browse files

Merge branch 'release/10.0.16'

parents e72e4fdd 776eadeb
......@@ -2,8 +2,12 @@
 
All notable changes to this project will be documented in this file. Dates are displayed in UTC.
 
#### [10.0.16](https://git.sickrage.ca/SiCKRAGE/sickrage/compare/10.0.15...10.0.16)
#### [10.0.15](https://git.sickrage.ca/SiCKRAGE/sickrage/compare/10.0.14...10.0.15)
 
> 28 July 2021
#### [10.0.14](https://git.sickrage.ca/SiCKRAGE/sickrage/compare/10.0.13...10.0.14)
 
> 28 July 2021
......
{
"name": "sickrage",
"version": "10.0.15",
"version": "10.0.16",
"private": true,
"repository": {
"type": "git",
......
[bumpversion]
current_version = 10.0.15
current_version = 10.0.16
commit = False
tag = False
parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(\.(?P<release>[a-z]+)(?P<dev>\d+))?
......
......@@ -19,7 +19,7 @@
# along with SiCKRAGE. If not, see <http://www.gnu.org/licenses/>.
# ##############################################################################
__version__ = "10.0.15"
__version__ = "10.0.16"
__install_type__ = ""
import argparse
......
sickrage/version.txt = bffe7a5bbba58aa521516818ec6c0144
sickrage/version.txt = f8956cb54fd714fa28985f70ac38a6a2
sickrage/checksums.md5 = d41d8cd98f00b204e9800998ecf8427e
sickrage/__init__.py = 6a1a08471ed4175eb9a9f8c252bf89d8
sickrage/__init__.py = 8441446e535f00a18640a2ad7497c597
sickrage/autoProcessTV/mediaToSiCKRAGE.py = f88a6679a211b1f97126c116e2c33b9c
sickrage/autoProcessTV/hellaToSiCKRAGE.py = 9bc477abfd456aaba8d6bf46f2c59b1f
sickrage/autoProcessTV/__init__.py = bfa892dee586740a3a618d3c1955156c
......@@ -290,7 +290,7 @@ sickrage/core/exceptions/__init__.py = bb106687a1cb41cf0da10e125e0c82c7
sickrage/core/websession/__init__.py = 6d3d11bec0c0855e08a4c8f2cb6b759e
sickrage/core/config/helpers.py = 8d8d00e7e7b4f04d91ce099245deb13a
sickrage/core/config/__init__.py = de29a2b668fe871cda8103664adc8853
sickrage/core/amqp/__init__.py = 34e52f4798a60b580f18f1070c39f02b
sickrage/core/amqp/__init__.py = a6cd7027633b87199f7627478671affe
sickrage/core/webserver/__init__.py = a1c9bc9c3d8ab1e1afc00d92cf645e69
sickrage/core/webserver/static/images/bootstrap-formhelpers-countries.flags.png = 8404ee935503dfec7a38ffe093f73e05
sickrage/core/webserver/static/images/poster-thumb.png = b788e8476ff0a2d3dfca0eb1d31bab58
......@@ -340,8 +340,8 @@ sickrage/core/webserver/static/fonts/fa-regular-400.ttf = 1a78af4105d4d56e6c34f7
sickrage/core/webserver/static/fonts/fa-brands-400.eot = 0fabb6606be4c45acfeedd115d0caca4
sickrage/core/webserver/static/fonts/fa-solid-900.svg = 03ba7cb710104df27f1c9c46d64bee4e
sickrage/core/webserver/static/css/core.min.css = 05ca1e9c48f013d71d97ecec458b9f76
sickrage/core/webserver/static/js/core.js.map = fbc675dc74a04b75ba4519055494ebc2
sickrage/core/webserver/static/js/core.min.js = 45471e4c1c065bbe1b845b45d9f5ce36
sickrage/core/webserver/static/js/core.js.map = 6ea8e972e98430e9209b0d589eb3b940
sickrage/core/webserver/static/js/core.min.js = aea0246363a1ff0a9cdf2c8d5d2cff27
sickrage/core/webserver/views/schedule.mako = 1492940accef5afe80d9cbd14be1c078
sickrage/core/webserver/views/history.mako = a90a54341918b398eb652d186a636952
sickrage/core/webserver/views/generic_message.mako = 20ba53fc129c1b69d5b8ccc960233757
......
......@@ -23,8 +23,9 @@ import urllib.parse
import pika
from google.protobuf.json_format import MessageToDict
from pika.adapters.tornado_connection import TornadoConnection
from pika.adapters.utils.connection_workflow import AMQPConnectorSocketConnectError
from pika.exceptions import StreamLostError, AMQPConnectionError, AMQPError
from pika.adapters.utils.connection_workflow import AMQPConnectorSocketConnectError, AMQPConnectorTransportSetupError, AMQPConnectorAMQPHandshakeError, \
AMQPConnectionWorkflowFailed, AMQPConnectorException
from pika.exceptions import StreamLostError, AMQPConnectionError, AMQPError, ConnectionClosedByBroker
from tornado.ioloop import IOLoop
import sickrage
......@@ -97,7 +98,7 @@ class AMQPClient(object):
on_close_callback=self.on_connection_close,
on_open_error_callback=self.on_connection_open_error
)
except (AMQPError, AMQPConnectorSocketConnectError, AMQPConnectionError):
except (AMQPConnectorException, AMQPConnectionError):
sickrage.app.log.debug("AMQP connection error, attempting to reconnect")
IOLoop.current().call_later(5, self.reconnect)
......
10.0.15
\ No newline at end of file
10.0.16
\ No newline at end of file
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment