github/plexpy
1
0
Fork 0
mirror of https://github.com/Tautulli/Tautulli.git synced 2025-07-06 13:11:15 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Restart after resetting git install

Browse source
This commit is contained in:
JonnyWong16 2020-03-06 15:26:26 -08:00
parent 42e33a0468
commit 8d67cc4c5a
5 changed files with 18 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Tautulli.py
View file

@ -263,6 +263,8 @@ def main():
plexpy.shutdown(restart=True) plexpy.shutdown(restart=True)
elif plexpy.SIGNAL == 'checkout': elif plexpy.SIGNAL == 'checkout':
plexpy.shutdown(restart=True, checkout=True) plexpy.shutdown(restart=True, checkout=True)
elif plexpy.SIGNAL == 'reset':
plexpy.shutdown(restart=True, reset=True)
else: else:
plexpy.shutdown(restart=True, update=True) plexpy.shutdown(restart=True, update=True)

9
data/interfaces/default/settings.html
View file

@ -2170,11 +2170,14 @@ $(document).ready(function() {
$("#reset_git_install").click(function () { $("#reset_git_install").click(function () {
var msg = 'Are you sure you want to reset your Tautulli installtion?'; var msg = 'Are you sure you want to reset your Tautulli installtion?';
var url = 'reset_git_install'; $('#confirm-message').html(msg);
confirmAjaxCall(url, msg); $('#confirm-modal').modal();
$('#confirm-modal').one('click', '#confirm-button', function () {
settingsChanged = false;
window.location.href = 'reset_git_install';
});
}); });
$('#api_key').click(function(){ $('#api_key').select() }); $('#api_key').click(function(){ $('#api_key').select() });
$("#generate_api").click(function() { $("#generate_api").click(function() {
$.get('generate_api_key', $.get('generate_api_key',

9
plexpy/__init__.py
View file

@ -2077,7 +2077,7 @@ def upgrade():
libraries.update_libraries_db_notify() libraries.update_libraries_db_notify()
def shutdown(restart=False, update=False, checkout=False): def shutdown(restart=False, update=False, checkout=False, reset=False):
webstart.stop() webstart.stop()
# Shutdown the websocket connection # Shutdown the websocket connection
@ -2112,6 +2112,13 @@ def shutdown(restart=False, update=False, checkout=False):
except Exception as e: except Exception as e:
logger.warn(u"Tautulli failed to switch git branch: %s. Restarting." % e) logger.warn(u"Tautulli failed to switch git branch: %s. Restarting." % e)
if reset:
logger.info(u"Tautulli is resetting the git install...")
try:
versioncheck.reset_git_install()
except Exception as e:
logger.warn(u"Tautulli failed to reset git install: %s. Restarting." % e)
if CREATEPID: if CREATEPID:
logger.info(u"Removing pidfile %s", PIDFILE) logger.info(u"Removing pidfile %s", PIDFILE)
os.remove(PIDFILE) os.remove(PIDFILE)

2
plexpy/versioncheck.py
View file

@ -328,7 +328,7 @@ def update():
return return
def reset(): def reset_git_install():
if plexpy.INSTALL_TYPE == 'git': if plexpy.INSTALL_TYPE == 'git':
logger.info('Attempting to reset git install to "%s/%s"' % (plexpy.CONFIG.GIT_REMOTE, plexpy.CONFIG.GIT_BRANCH)) logger.info('Attempting to reset git install to "%s/%s"' % (plexpy.CONFIG.GIT_REMOTE, plexpy.CONFIG.GIT_BRANCH))
output, err = runGit('remote set-url {} https://github.com/{}/{}.git'.format(plexpy.CONFIG.GIT_REMOTE, output, err = runGit('remote set-url {} https://github.com/{}/{}.git'.format(plexpy.CONFIG.GIT_REMOTE,

9
plexpy/webserve.py
View file

@ -3920,16 +3920,9 @@ class WebInterface(object):
return self.do_state_change('checkout', 'Switching Git Branches', 120) return self.do_state_change('checkout', 'Switching Git Branches', 120)
@cherrypy.expose @cherrypy.expose
@cherrypy.tools.json_out()
@requireAuth(member_of("admin")) @requireAuth(member_of("admin"))
def reset_git_install(self, **kwargs): def reset_git_install(self, **kwargs):
result = versioncheck.reset() return self.do_state_change('reset', 'Resetting Git Install', 120)
if result:
return {'result': 'success', 'message': 'Tautulli installation reset.'}
else:
return {'result': 'error', 'message': 'Reset installation failed.'}
@cherrypy.expose @cherrypy.expose
@requireAuth(member_of("admin")) @requireAuth(member_of("admin"))