Commit 200a368f authored by echel0n's avatar echel0n
Browse files

Merge branch 'release/10.0.30'

parents d2518a30 5ab59bde
......@@ -2,8 +2,14 @@
 
All notable changes to this project will be documented in this file. Dates are displayed in UTC.
 
#### [10.0.30](https://git.sickrage.ca/SiCKRAGE/sickrage/compare/10.0.29...10.0.30)
- fixed amqp bug that caused a restart loop when updating ssl server cert/key [`827fac1`](https://git.sickrage.ca/SiCKRAGE/sickrage/commit/827fac18e2d7b71334207c4c3387fa8fcfdc9b44)
#### [10.0.29](https://git.sickrage.ca/SiCKRAGE/sickrage/compare/10.0.28...10.0.29)
 
> 6 August 2021
#### [10.0.28](https://git.sickrage.ca/SiCKRAGE/sickrage/compare/10.0.27...10.0.28)
 
> 5 August 2021
......
{
"name": "sickrage",
"version": "10.0.29",
"version": "10.0.30",
"private": true,
"repository": {
"type": "git",
......
[bumpversion]
current_version = 10.0.29
current_version = 10.0.30
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.29"
__version__ = "10.0.30"
__install_type__ = ""
import argparse
......
sickrage/version.txt = 2d70e61b80f9030cdd40ecca48857812
sickrage/version.txt = 20e19b0b52080cf1203b05a94eff9c1c
sickrage/checksums.md5 = d41d8cd98f00b204e9800998ecf8427e
sickrage/__init__.py = 77253c065a80b96d2148b1fe2881a763
sickrage/__init__.py = 34f52bedeae357143a73867931804c17
sickrage/autoProcessTV/mediaToSiCKRAGE.py = f88a6679a211b1f97126c116e2c33b9c
sickrage/autoProcessTV/hellaToSiCKRAGE.py = 9bc477abfd456aaba8d6bf46f2c59b1f
sickrage/autoProcessTV/__init__.py = bfa892dee586740a3a618d3c1955156c
......@@ -256,7 +256,7 @@ sickrage/core/enums.py = 5a8fac089e8c4451a1d6b28c1762e684
sickrage/core/scene_numbering.py = e517e5232d3b9ca186fe8b33578abd4b
sickrage/core/announcements.py = 6c3ed44e7ae50c281383ab5f278102c6
sickrage/core/imdb_popular.py = 4739028ad8dac20901db175ef9df5875
sickrage/core/version_updater.py = 98b85d906a963b72dea59c1df4ea3568
sickrage/core/version_updater.py = ae9f96fefa51f8827b34b93430b1d288
sickrage/core/traktapi.py = e30a23461b7e5d3af7619ad3e229bc40
sickrage/core/search.py = c8d189e6b61f29e6a364520c5142192e
sickrage/core/nzbSplitter.py = 8bb813262916d2208e905fb53e575284
......@@ -264,7 +264,7 @@ sickrage/core/ui.py = bc530df3dcdf73126f22b7c5719641be
sickrage/core/classes.py = ca0d7c07b684b8fe22788346dc755fd8
sickrage/core/blackandwhitelist.py = 9d0a8e2aae2353a842306730c2690c2c
sickrage/core/common.py = 8eca84658272c806858b105179285693
sickrage/core/__init__.py = 55054eedab976ac3cdcd772d8c3f092f
sickrage/core/__init__.py = 0b5f219f0233f47d76f75499edecb889
sickrage/core/upnp.py = 51eb609bd1f59baa3c0c346d5ac19787
sickrage/core/google_drive.py = 0129b53b8a649fa7c55bfe0c5ad11bdb
sickrage/core/media/fanart.py = e9a4232ff01ef3473e628e3eecf80e6c
......@@ -291,7 +291,7 @@ sickrage/core/websession/__init__.py = 6d3d11bec0c0855e08a4c8f2cb6b759e
sickrage/core/config/helpers.py = 8d0d9e502b0fa5eff071558ca0f496d3
sickrage/core/config/__init__.py = de29a2b668fe871cda8103664adc8853
sickrage/core/amqp/__init__.py = cc99abacdc1d2faf46071e03c75af2a0
sickrage/core/webserver/__init__.py = 8e97a9492ac39f6ad3cfdf4b53257acd
sickrage/core/webserver/__init__.py = cb41e2e950df76ce937a77d4b1928b25
sickrage/core/webserver/static/images/bootstrap-formhelpers-countries.flags.png = 8404ee935503dfec7a38ffe093f73e05
sickrage/core/webserver/static/images/poster-thumb.png = b788e8476ff0a2d3dfca0eb1d31bab58
sickrage/core/webserver/static/images/sickrage-subtitles.png = adc2bc36d6ce96731911947cabb3bf78
......@@ -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 = 718c0e47176b538069ddb749e026b5eb
sickrage/core/webserver/static/js/core.min.js = 6c88a935755c499c93d2aeda8840f061
sickrage/core/webserver/static/js/core.js.map = bef6782a99b548419b210075de455d31
sickrage/core/webserver/static/js/core.min.js = a3918012bf5ac4b4ddd340383e086f4e
sickrage/core/webserver/views/schedule.mako = 1492940accef5afe80d9cbd14be1c078
sickrage/core/webserver/views/history.mako = a90a54341918b398eb652d186a636952
sickrage/core/webserver/views/generic_message.mako = 20ba53fc129c1b69d5b8ccc960233757
......@@ -435,12 +435,12 @@ sickrage/core/webserver/handlers/api/v2/series_provider/schemas.py = 014e8408340
sickrage/core/webserver/handlers/api/v2/series_provider/__init__.py = 1e0538b415c3346d724effb9fbf8f92a
sickrage/core/webserver/handlers/api/v2/history/schemas.py = 014e84083401e6b05a9626cb29bd8467
sickrage/core/webserver/handlers/api/v2/history/__init__.py = 96ec5aabeb125e7340012655ccb499c7
sickrage/core/webserver/handlers/api/v1/__init__.py = 779d242581363f8bbdf2ac4ab66fad1b
sickrage/core/webserver/handlers/api/v1/__init__.py = 08acffa6224dc735dea096a4a4ac27fa
sickrage/core/webserver/handlers/manage/queues.py = f92d4a8b34b1872e529886f4aa80ed08
sickrage/core/webserver/handlers/manage/__init__.py = 99ba915c56a2f50b76803e0ef7b1235f
sickrage/core/webserver/handlers/home/add_shows.py = 63773c53ec9288661aadeb242e15ab0e
sickrage/core/webserver/handlers/home/postprocess.py = bd1ea821bd162300af4b5bf27c5aba94
sickrage/core/webserver/handlers/home/__init__.py = 06c15e8230c64566c1bc6f2d8d1fecbd
sickrage/core/webserver/handlers/home/__init__.py = e9cd242d928a6881fce94adb3e542974
sickrage/core/auth/__init__.py = 79e12d912c821e5c8e99ffe1a0011cd9
sickrage/core/searchers/trakt_searcher.py = 27331bd87d5cfa83e026896bcc41deef
sickrage/core/searchers/backlog_searcher.py = bfc8a80620ee07b21627cc982d07b2e4
......
......@@ -738,6 +738,9 @@ class Core(object):
self.started = False
def restart(self):
self.shutdown(restart=True)
def shutdown_trigger(self):
if not self.started:
IOLoop.current().stop()
......@@ -100,7 +100,7 @@ class VersionUpdater(object):
if self.update():
sickrage.app.log.info("Update was successful!")
sickrage.app.alerts.message(_('Updater'), _('Update was successful'))
sickrage.app.shutdown(restart=True)
sickrage.app.restart()
else:
sickrage.app.log.info("Update failed!")
sickrage.app.alerts.error(_('Updater'), _('Update failed!'))
......
......@@ -31,7 +31,7 @@ from cryptography.hazmat.backends import default_backend
from cryptography.x509 import ExtensionNotFound
from mako.lookup import TemplateLookup
from tornado.httpserver import HTTPServer
from tornado.ioloop import PeriodicCallback
from tornado.ioloop import PeriodicCallback, IOLoop
from tornado.web import Application, RedirectHandler, StaticFileHandler
import sickrage
......@@ -529,10 +529,11 @@ class WebServer(object):
with open(sickrage.app.https_key_file, 'w') as key_out:
key_out.write(resp['private_key'])
sickrage.app.log.info("Loaded SSL certificate successfully")
sickrage.app.log.info("Loaded SSL certificate successfully, restarting server in 1 minute")
if self.server:
sickrage.app.shutdown(restart=True)
# restart after 1 minute
IOLoop.current().add_timeout(datetime.timedelta(minutes=1), sickrage.app.restart)
return True
......
......@@ -1489,7 +1489,7 @@ class CMD_SiCKRAGERestart(ApiV1Handler):
def run(self):
""" Restart SiCKRAGE """
sickrage.app.shutdown(restart=True)
sickrage.app.restart()
return _responds(RESULT_SUCCESS, msg="SiCKRAGE is restarting...")
......
......@@ -700,12 +700,11 @@ class RestartHandler(BaseHandler):
self.current_user = None
sickrage.app.scheduler.add_job(
sickrage.app.shutdown,
sickrage.app.restart,
DateTrigger(
run_date=datetime.datetime.utcnow() + datetime.timedelta(seconds=5),
timezone='utc'
),
kwargs={'restart': True}
)
)
return self.render('home/restart.mako',
......
10.0.29
\ No newline at end of file
10.0.30
\ 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