Commit 45a09087 authored by echel0n's avatar echel0n
Browse files

Merge branch 'release/10.0.18'

parents 2cf6f31a 6868e716
......@@ -2,8 +2,12 @@
 
All notable changes to this project will be documented in this file. Dates are displayed in UTC.
 
#### [10.0.18](https://git.sickrage.ca/SiCKRAGE/sickrage/compare/10.0.17...10.0.18)
#### [10.0.17](https://git.sickrage.ca/SiCKRAGE/sickrage/compare/10.0.16...10.0.17)
 
> 29 July 2021
#### [10.0.16](https://git.sickrage.ca/SiCKRAGE/sickrage/compare/10.0.15...10.0.16)
 
> 29 July 2021
......
{
"name": "sickrage",
"version": "10.0.17",
"version": "10.0.18",
"private": true,
"repository": {
"type": "git",
......
[bumpversion]
current_version = 10.0.17
current_version = 10.0.18
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.17"
__version__ = "10.0.18"
__install_type__ = ""
import argparse
......
sickrage/__init__.py = a5f4cfe80228eca237eb5123553c191b
sickrage/__init__.py = 60631e4f394b568b243930a8d8f683a4
sickrage/checksums.md5 = d41d8cd98f00b204e9800998ecf8427e
sickrage/version.txt = ba7cf1cc3c906db9ae47d276e2f1851f
sickrage/version.txt = fe883d52c6b62be628ca5b3ad8f62f78
sickrage/autoProcessTV/hellaToSiCKRAGE.py = 9bc477abfd456aaba8d6bf46f2c59b1f
sickrage/autoProcessTV/__init__.py = bfa892dee586740a3a618d3c1955156c
sickrage/autoProcessTV/mediaToSiCKRAGE.py = f88a6679a211b1f97126c116e2c33b9c
......@@ -165,8 +165,8 @@ sickrage/core/webserver/static/images/backdrops/manage.jpg = 2e49098c0ed9aacf602
sickrage/core/webserver/static/images/backdrops/addshows.jpg = 7f3e186790208b63dadda09d6b91d334
sickrage/core/webserver/static/images/backdrops/home.jpg = 804dfc976638bbf45df310a3627e2d5c
sickrage/core/webserver/static/images/backdrops/schedule.jpg = 0c0e5f4dcee42bfcfb73de100f1d3015
sickrage/core/webserver/static/js/core.js.map = 563cf8ee52d8dcaef78381a9205c1f19
sickrage/core/webserver/static/js/core.min.js = 0c706964ff2d74b07955a0fd7cf0f8a3
sickrage/core/webserver/static/js/core.js.map = a4ea3d0e1984a7188718cd80847af90e
sickrage/core/webserver/static/js/core.min.js = 9375203fd6bc49c155bd74684b2c13f0
sickrage/core/webserver/static/fonts/fa-solid-900.eot = 89bd2e38475e441a5cd70f663f921d61
sickrage/core/webserver/static/fonts/fa-regular-400.eot = ad3a7c0d77e09602f4ab73db3660ffd8
sickrage/core/webserver/static/fonts/fa-brands-400.eot = 0fabb6606be4c45acfeedd115d0caca4
......@@ -256,7 +256,7 @@ sickrage/core/caches/image_cache.py = e97a0b7f9d95ad22813b9c2b5f1f9ffd
sickrage/core/caches/tv_cache.py = 9b4d289ac83882d5b682df97b89d5fd3
sickrage/core/caches/__init__.py = bf0bdb641ddd7af015537ca503e49977
sickrage/core/caches/name_cache.py = 8cceca1983838af2e581c6187912b2cc
sickrage/core/amqp/__init__.py = 20b818ee83cb56472653a7c9091524f7
sickrage/core/amqp/__init__.py = 029538ce759eb97082da63c6f0936688
sickrage/core/databases/__init__.py = b232e45d8996a662866178c2d6d6169b
sickrage/core/databases/config/__init__.py = 2ece97d07008bf50e49aea26f3a50342
sickrage/core/databases/config/schemas.py = fb5ab0a7e0b851bb5fef6f4a7cd55912
......
......@@ -18,7 +18,7 @@
# You should have received a copy of the GNU General Public License
# along with SiCKRAGE. If not, see <http://www.gnu.org/licenses/>.
# ##############################################################################
import urllib.parse
import ssl
from ssl import SSLCertVerificationError
import pika
......@@ -91,10 +91,22 @@ class AMQPClient(object):
sickrage.app.api.refresh_token()
try:
credentials = pika.credentials.PlainCredentials(username='sickrage', password=sickrage.app.api.token["access_token"])
context = ssl.create_default_context()
context.check_hostname = False
context.verify_mode = ssl.CERT_NONE
parameters = pika.ConnectionParameters(
host=self._amqp_host,
port=self._amqp_port,
virtual_host=self._amqp_vhost,
credentials=credentials,
ssl_options=pika.SSLOptions(context)
)
TornadoConnection(
pika.URLParameters(
f'amqps://sickrage:{sickrage.app.api.token["access_token"]}@{self._amqp_host}:{self._amqp_port}/{urllib.parse.quote(self._amqp_vhost)}'
),
parameters,
on_open_callback=self.on_connection_open,
on_close_callback=self.on_connection_close,
on_open_error_callback=self.on_connection_open_error
......
10.0.17
\ No newline at end of file
10.0.18
\ 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