Buildout; Removing automatic restart from upgrade process

This commit is contained in:
James Barnsley
2018-05-03 13:14:23 +12:00
parent 4ded104c21
commit 2cfb7afed5
5 changed files with 51 additions and 10 deletions

View File

@ -528,9 +528,9 @@ class IrisCore(object):
return error
self.broadcast(data={
'method': "upgrading",
'method': "upgrade_started",
'params': {}
})
});
# Run the system task
path = os.path.dirname(__file__)
@ -557,14 +557,15 @@ class IrisCore(object):
else:
return error
output = result.decode();
self.broadcast(data={
'method': "upgrade_complete",
'params': {}
});
# And now restart (with a 5 second delay to allow our response to return first)
subprocess.Popen(["sudo "+path+"/system.sh restart 5"], shell=True)
output = result.decode();
# Now we can return for simple requests
response = {
'message': "Upgrade complete, restarting server in 5 seconds",
'message': "Restart required to complete upgrade",
'data': {
'output': output
}

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -77,7 +77,7 @@
// Release details
// These are automatically injected to built HTML
var build = "1525291305";
var build = "1525309512";
var version = "3.18.0";
// Construct the script tag