Commit 1ea1fd89 authored by echel0n's avatar echel0n
Browse files

Merge branch 'release/10.0.33'

parents 55026bae 41dbd7dd
......@@ -2,8 +2,12 @@
 
All notable changes to this project will be documented in this file. Dates are displayed in UTC.
 
#### [10.0.33](https://git.sickrage.ca/SiCKRAGE/sickrage/compare/10.0.32...10.0.33)
#### [10.0.32](https://git.sickrage.ca/SiCKRAGE/sickrage/compare/10.0.31...10.0.32)
 
> 10 August 2021
- fixed issue with network timezones and search provider urls not being updated on first use of app [`ca8aaef`](https://git.sickrage.ca/SiCKRAGE/sickrage/commit/ca8aaefdd124fd4dc76e596c89ef8c8325ae3504)
- fixed issue with network timezones and search provider urls not being updated on first use of app [`c1ec8ce`](https://git.sickrage.ca/SiCKRAGE/sickrage/commit/c1ec8ce1757759c8622548a3f2c0970d81ee4053)
 
......
{
"name": "sickrage",
"version": "10.0.32",
"version": "10.0.33",
"private": true,
"repository": {
"type": "git",
......
......@@ -91,7 +91,7 @@ SQLAlchemy==1.3.18
SQLAlchemy-Utils==0.36.8
stevedore==3.2.0
subliminal==2.1.0
tornado==6.0.4
tornado==6.1
twilio==6.44.2
tzlocal==2.1
Unidecode==1.1.1
......
[bumpversion]
current_version = 10.0.32
current_version = 10.0.33
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.32"
__version__ = "10.0.33"
__install_type__ = ""
import argparse
......
sickrage/version.txt = 3a9fd6666585a7ed783930674bfebe93
sickrage/version.txt = 8c6907204809139f9dbd76f35d79fa2f
sickrage/checksums.md5 = d41d8cd98f00b204e9800998ecf8427e
sickrage/__init__.py = 8965e359003d4e0016d2540f10ee4308
sickrage/__init__.py = a8d96e558ba739d45c2c22facc79929d
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 = 8d0d9e502b0fa5eff071558ca0f496d3
sickrage/core/config/__init__.py = e0bca86f699956c7cfb440dda36a61d7
sickrage/core/amqp/__init__.py = c24e361011e192e8762eaef5522c80d1
sickrage/core/amqp/__init__.py = c313bc172aea8d8c3aa83f249fe5a15f
sickrage/core/amqp/consumer.py = 9e489bad0db4eb4dc544382bdb97b2c1
sickrage/core/webserver/__init__.py = b56927ec9027045d1656f9a55344a09e
sickrage/core/webserver/static/images/bootstrap-formhelpers-countries.flags.png = 8404ee935503dfec7a38ffe093f73e05
......@@ -341,8 +341,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 = 167d1842a494e16397c04c3babca90be
sickrage/core/webserver/static/js/core.min.js = bf70a4427d0c7aa64b5f46ea96db3cd6
sickrage/core/webserver/static/js/core.js.map = 0a1063624096582c28c3131de50f0c32
sickrage/core/webserver/static/js/core.min.js = ae7bd37a5cd2fc7d1b1712e7692a70ed
sickrage/core/webserver/views/schedule.mako = 1492940accef5afe80d9cbd14be1c078
sickrage/core/webserver/views/history.mako = a90a54341918b398eb652d186a636952
sickrage/core/webserver/views/generic_message.mako = 20ba53fc129c1b69d5b8ccc960233757
......@@ -459,7 +459,7 @@ sickrage/core/nameparser/__init__.py = 27c01e5b187d2197b6fdaa418d178f4f
sickrage/core/nameparser/regexes.py = fbfb89e90f012a287266be8db0e2faf9
sickrage/core/websocket/__init__.py = e94b857678125d859b7e28ee1db9b10e
sickrage/core/api/exceptions.py = bdac7bcebad3d9ce2809f2d7e65810e0
sickrage/core/api/__init__.py = 08981481c15c8740ac57c32e9138bc58
sickrage/core/api/__init__.py = 1a2e8d8b4b37ba7681906866258d98ad
sickrage/core/databases/__init__.py = b232e45d8996a662866178c2d6d6169b
sickrage/core/databases/main/schemas.py = 7264494b24575ea1dcab57f0b3edc01d
sickrage/core/databases/main/__init__.py = e99217a8bcc3e5ef41741aebb789e751
......
......@@ -45,15 +45,23 @@ class AMQPBase(object):
IOLoop.current().add_callback(self.connect)
def connect(self):
# check for api token
if not sickrage.app.api.token or not sickrage.app.config.general.server_id:
IOLoop.current().call_later(5, self.reconnect)
return
# refresh api token if needed
if sickrage.app.api.token_time_remaining < (int(sickrage.app.api.token['expires_in']) / 2):
if not sickrage.app.api.refresh_token():
IOLoop.current().call_later(5, self.reconnect)
return
# declare server amqp queue
if not sickrage.app.api.server.declare_amqp_queue(sickrage.app.config.general.server_id):
IOLoop.current().call_later(5, self.reconnect)
return
# connect to amqp server
try:
credentials = pika.credentials.PlainCredentials(username='sickrage', password=sickrage.app.api.token["access_token"])
......
import collections
import errno
import time
import traceback
from urllib.parse import urljoin
import errno
import oauthlib.oauth2
import requests
import requests.exceptions
......@@ -15,7 +15,6 @@ from sqlalchemy import orm
import sickrage
from sickrage.core.api.exceptions import APIError
from sickrage.core.databases.cache import CacheDB
from sickrage.core.helpers import get_internal_ip, get_external_ip
class API(object):
......@@ -319,6 +318,9 @@ class API(object):
def get_server_certificate(self, server_id):
return self.api.request('GET', f'server/{server_id}/certificate')
def declare_amqp_queue(self, server_id):
return self.api.request('GET', f'server/{server_id}/declare-amqp-queue')
def upload_config(self, server_id, pkey_sig, config):
data = {
'server-id': server_id,
......
10.0.32
\ No newline at end of file
10.0.33
\ 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