tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-28 00:04:37 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix reload server update to license pandora_enterprise#12178

Browse Source
This commit is contained in:
daniel 2024-02-12 14:58:00 +01:00
parent d5b780ee99
commit c6a662a070
3 changed files with 43 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pandora_console/include/class/ConsoleSupervisor.php
View File

@ -1510,7 +1510,14 @@ class ConsoleSupervisor
{ {
global $config; global $config;
$types_sql = ''; $types_sql = sprintf(
' AND (
`server_type` != %d AND
`server_type` != %d
)',
SERVER_TYPE_AUTOPROVISION,
SERVER_TYPE_MIGRATION
);
if (is_metaconsole() === true && isset($config['ndbh']) === false) { if (is_metaconsole() === true && isset($config['ndbh']) === false) {
$types_sql = sprintf( $types_sql = sprintf(
' AND ( ' AND (

9
pandora_console/include/functions_servers.php
View File

@ -631,7 +631,14 @@ function servers_get_info($id_server=-1, $sql_limit=-1)
$select_id = ' AND id_server IN ('.(int) $id_server.')'; $select_id = ' AND id_server IN ('.(int) $id_server.')';
} }
$types_sql = ''; $types_sql = sprintf(
' AND (
`server_type` != %d AND
`server_type` != %d
)',
SERVER_TYPE_AUTOPROVISION,
SERVER_TYPE_MIGRATION
);
if (is_metaconsole() === true && isset($config['ndbh']) === false) { if (is_metaconsole() === true && isset($config['ndbh']) === false) {
$types_sql = sprintf( $types_sql = sprintf(
' AND ( ' AND (

27
pandora_server/util/pandora_ha.pl
View File

@ -58,6 +58,9 @@ my $Restart = 0;
# Controlled exit # Controlled exit
my $Running = 0; my $Running = 0;
# License
my $License;
######################################################################## ########################################################################
# Print the given message with a preceding timestamp. # Print the given message with a preceding timestamp.
######################################################################## ########################################################################
@ -359,6 +362,27 @@ sub ha_update_server($$) {
} }
###############################################################################
# Restart pandora server on demand.
###############################################################################
sub ha_restart_server($$) {
my ($config, $dbh) = @_;
my $OSNAME = $^O;
my $current_license;
if (!defined($License)) {
$License = get_db_value($dbh, 'SELECT `value` FROM `tupdate_settings` WHERE `key` = "customer_key"');
$current_license = $License;
} else {
$current_license = get_db_value($dbh, 'SELECT `value` FROM `tupdate_settings` WHERE `key` = "customer_key"');
}
if($License ne $current_license) {
ha_restart_pandora($config);
$License = $current_license;
}
}
################################################################################ ################################################################################
# Dump the list of known databases to disk. # Dump the list of known databases to disk.
################################################################################ ################################################################################
@ -691,6 +715,9 @@ sub ha_main_pandora($) {
# Check if there are updates pending. # Check if there are updates pending.
ha_update_server($conf, $dbh); ha_update_server($conf, $dbh);
# Check restart server on demand.
ha_restart_server($conf, $dbh);
# Keep pandora running # Keep pandora running
ha_keep_pandora_running($conf, $dbh); ha_keep_pandora_running($conf, $dbh);