github
/
haproxy-wi
mirror of https://github.com/Aidaho12/haproxy-wi
1
0
Fork 0
Code Issues Releases Wiki Activity

v5.3.1.0 

Changelog: https://haproxy-wi.org/changelog.py#5_3_1
pull/304/head
Pavel Loginov 2021-10-27 00:07:56 +06:00
parent acdf08ee74
commit f5e0aa7d03
3 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/db_model.py
View File

@ -13,7 +13,7 @@ if mysql_enable == '1':
conn = MySQLDatabase(mysql_db, user=mysql_user, password=mysql_password, host=mysql_host, port=int(mysql_port)) conn = MySQLDatabase(mysql_db, user=mysql_user, password=mysql_password, host=mysql_host, port=int(mysql_port))
else: else:
db = "/var/www/haproxy-wi/app/roxy-wi.db" db = "/var/www/haproxy-wi/app/roxy-wi.db"
conn = SqliteDatabase(db) conn = SqliteDatabase(db, pragmas={'timeout': 10000})
class BaseModel(Model): class BaseModel(Model):

13
app/options.py
View File

@ -2038,7 +2038,9 @@ if form.getvalue('newserver') is not None:
page=page, page=page,
adding=1) adding=1)
print(template) print(template)
funct.logging('a new server ' + hostname, ' has been created ', haproxywi=1, login=1) funct.logging('a new server ' + hostname, ' has been created ', haproxywi=1, login=1)
funct.logging(ip, 'A new server ' + hostname + ' has been created', haproxywi=1, login=1,
keep_history=1, service='server')
if form.getvalue('updatehapwiserver') is not None: if form.getvalue('updatehapwiserver') is not None:
hapwi_id = form.getvalue('updatehapwiserver') hapwi_id = form.getvalue('updatehapwiserver')
@ -2071,6 +2073,9 @@ if form.getvalue('updateserver') is not None:
else: else:
sql.update_server(name, group, typeip, enable, master, serv_id, cred, port, desc, haproxy, nginx, firewall, protected) sql.update_server(name, group, typeip, enable, master, serv_id, cred, port, desc, haproxy, nginx, firewall, protected)
funct.logging('the server ' + name, ' has been updated ', haproxywi=1, login=1) funct.logging('the server ' + name, ' has been updated ', haproxywi=1, login=1)
server_ip = sql.select_server_ip_by_id(serv_id)
funct.logging(server_ip, 'The server ' + name + ' has been update', haproxywi=1, login=1,
keep_history=1, service='server')
if form.getvalue('serverdel') is not None: if form.getvalue('serverdel') is not None:
server_id = form.getvalue('serverdel') server_id = form.getvalue('serverdel')
@ -3095,7 +3100,7 @@ if form.getvalue('doworkspace'):
from jinja2 import Environment, FileSystemLoader from jinja2 import Environment, FileSystemLoader
user, user_id, role, token, servers = funct.get_users_params() user, user_id, role, token, servers, user_services = funct.get_users_params()
new_server = sql.select_provisioned_servers(new=workspace, group=group, type='do') new_server = sql.select_provisioned_servers(new=workspace, group=group, type='do')
env = Environment(extensions=["jinja2.ext.do"], loader=FileSystemLoader('templates')) env = Environment(extensions=["jinja2.ext.do"], loader=FileSystemLoader('templates'))
@ -3188,7 +3193,7 @@ if form.getvalue('awsworkspace'):
from jinja2 import Environment, FileSystemLoader from jinja2 import Environment, FileSystemLoader
user, user_id, role, token, servers = funct.get_users_params() user, user_id, role, token, servers, user_services = funct.get_users_params()
new_server = sql.select_provisioned_servers(new=workspace, group=group, type='aws') new_server = sql.select_provisioned_servers(new=workspace, group=group, type='aws')
env = Environment(extensions=["jinja2.ext.do"], loader=FileSystemLoader('templates')) env = Environment(extensions=["jinja2.ext.do"], loader=FileSystemLoader('templates'))
@ -3454,7 +3459,7 @@ if form.getvalue('gcoreworkspace'):
from jinja2 import Environment, FileSystemLoader from jinja2 import Environment, FileSystemLoader
user, user_id, role, token, servers = funct.get_users_params() user, user_id, role, token, servers, user_services = funct.get_users_params()
new_server = sql.select_provisioned_servers(new=workspace, group=group, type='gcore') new_server = sql.select_provisioned_servers(new=workspace, group=group, type='gcore')
env = Environment(extensions=["jinja2.ext.do"], loader=FileSystemLoader('templates')) env = Environment(extensions=["jinja2.ext.do"], loader=FileSystemLoader('templates'))

18
inc/provisioning.js
View File

@ -517,7 +517,7 @@ function awsProvisiningServer() {
type: "POST", type: "POST",
success: function( data ) { success: function( data ) {
data = data.replace(/\s+/g, ' '); data = data.replace(/\s+/g, ' ');
var server_id = $('#ajax-provisioning-body tr td span:regex(id, sever-ip-)').last().attr('id').split('-')[2] var server_id = $('#ajax-provisioning-body tr td span:regex(id, server-ip-)').last().attr('id').split('-')[2]
if (data.indexOf('error:') != '-1' && data.indexOf('Last error:') == '-1') { if (data.indexOf('error:') != '-1' && data.indexOf('Last error:') == '-1') {
showProvisioningError(data, '#creating-server', '#creating-workspace', '#wait-mess', '#creating-error', '#creating-progress', 'aws'); showProvisioningError(data, '#creating-server', '#creating-workspace', '#wait-mess', '#creating-error', '#creating-progress', 'aws');
$('#sever-status-'+server_id).text('Error'); $('#sever-status-'+server_id).text('Error');
@ -529,7 +529,7 @@ function awsProvisiningServer() {
$('#created-mess').html('Server has been created. Server IPs are:' + data); $('#created-mess').html('Server has been created. Server IPs are:' + data);
$('#created-mess').show(); $('#created-mess').show();
$('#sever-status-'+server_id).text('Created'); $('#sever-status-'+server_id).text('Created');
$('#sever-ip-'+server_id).text(data); $('#server-ip-'+server_id).text(data);
add_button_after_server_created(); add_button_after_server_created();
} }
} }
@ -705,7 +705,7 @@ function awsEditProvisiningServer(server_id, dialog_id) {
$('#sever-os-'+server_id).text($('#aws_edit_oss').val()); $('#sever-os-'+server_id).text($('#aws_edit_oss').val());
$('#server-'+server_id).css('background-color', '#fff'); $('#server-'+server_id).css('background-color', '#fff');
$('#sever-status-'+server_id).css('color', '#000'); $('#sever-status-'+server_id).css('color', '#000');
$('#sever-ip-'+server_id).text(data); $('#server-ip-'+server_id).text(data);
} }
} }
} ); } );
@ -1552,7 +1552,7 @@ function doEditProvisiningServer(server_id) {
$('#sever-size-'+server_id).text($('#aws_edit_size').val()); $('#sever-size-'+server_id).text($('#aws_edit_size').val());
$('#sever-os-'+server_id).text($('#aws_edit_oss').val()); $('#sever-os-'+server_id).text($('#aws_edit_oss').val());
$('#server-'+server_id).css('background-color', '#fff'); $('#server-'+server_id).css('background-color', '#fff');
$('#sever-ip-'+server_id).text(data); $('#server-ip-'+server_id).text(data);
} }
} }
} ); } );
@ -1692,7 +1692,7 @@ function doProvisiningServer() {
type: "POST", type: "POST",
success: function( data ) { success: function( data ) {
data = data.replace(/\s+/g, ' '); data = data.replace(/\s+/g, ' ');
var server_id = $('#ajax-provisioning-body tr td span:regex(id, sever-ip-)').last().attr('id').split('-')[2] var server_id = $('#ajax-provisioning-body tr td span:regex(id, server-ip-)').last().attr('id').split('-')[2]
if (data.indexOf('error:') != '-1' && data.indexOf('Last error:') == '-1') { if (data.indexOf('error:') != '-1' && data.indexOf('Last error:') == '-1') {
showProvisioningError(data, '#creating-server', '#creating-workspace', '#wait-mess', '#creating-error', '#creating-progress', 'do'); showProvisioningError(data, '#creating-server', '#creating-workspace', '#wait-mess', '#creating-error', '#creating-progress', 'do');
$('#sever-status-'+server_id).text('Error'); $('#sever-status-'+server_id).text('Error');
@ -1704,7 +1704,7 @@ function doProvisiningServer() {
$('#created-mess').html('Server has been created. Server IPs are: ' + data); $('#created-mess').html('Server has been created. Server IPs are: ' + data);
$('#created-mess').show(); $('#created-mess').show();
$('#sever-status-'+server_id).text('Created'); $('#sever-status-'+server_id).text('Created');
$('#sever-ip-'+server_id).text(data); $('#server-ip-'+server_id).text(data);
add_do_button_after_server_created(); add_do_button_after_server_created();
} }
} }
@ -1844,7 +1844,7 @@ function gcoreProvisiningServer() {
type: "POST", type: "POST",
success: function( data ) { success: function( data ) {
data = data.replace(/\s+/g, ' '); data = data.replace(/\s+/g, ' ');
var server_id = $('#ajax-provisioning-body tr td span:regex(id, sever-ip-)').last().attr('id').split('-')[2] var server_id = $('#ajax-provisioning-body tr td span:regex(id, server-ip-)').last().attr('id').split('-')[2]
if (data.indexOf('error:') != '-1' && data.indexOf('Last error:') == '-1') { if (data.indexOf('error:') != '-1' && data.indexOf('Last error:') == '-1') {
showProvisioningError(data, '#creating-server', '#creating-workspace', '#wait-mess', '#creating-error', '#creating-progress', 'gcore'); showProvisioningError(data, '#creating-server', '#creating-workspace', '#wait-mess', '#creating-error', '#creating-progress', 'gcore');
$('#sever-status-'+server_id).text('Error'); $('#sever-status-'+server_id).text('Error');
@ -1859,7 +1859,7 @@ function gcoreProvisiningServer() {
$('#created-mess').show(); $('#created-mess').show();
$('#sever-status-'+server_id).text('Created'); $('#sever-status-'+server_id).text('Created');
$('#sever-status-'+server_id).css('color', 'var(--green-color)'); $('#sever-status-'+server_id).css('color', 'var(--green-color)');
$('#sever-ip-'+server_id).text(data[0]); $('#server-ip-'+server_id).text(data[0]);
$('#server-name-'+server_id).text(gcoreprovisining+'('+data[1]+')'); $('#server-name-'+server_id).text(gcoreprovisining+'('+data[1]+')');
add_gcore_button_after_server_created(); add_gcore_button_after_server_created();
} }
@ -2043,7 +2043,7 @@ function gcoreEditProvisiningServer(server_id, dialog_id) {
$('#sever-os-'+server_id).text($('#gcore_edit_oss').val()); $('#sever-os-'+server_id).text($('#gcore_edit_oss').val());
$('#server-'+server_id).css('background-color', '#fff'); $('#server-'+server_id).css('background-color', '#fff');
$('#sever-status-'+server_id).css('color', 'var(--green-color)'); $('#sever-status-'+server_id).css('color', 'var(--green-color)');
$('#sever-ip-'+server_id).text(data[0]); $('#server-ip-'+server_id).text(data[0]);
$('#server-name-'+server_id).text(gcoreeditgprovisining+'('+data[1]+')'); $('#server-name-'+server_id).text(gcoreeditgprovisining+'('+data[1]+')');
} }
} }