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

Merge branch 'ent-12870-Problemas-de-llenado-de-logs-con-pandora-gotty' into 'develop'

Browse Source 
prevent warnings

See merge request artica/pandorafms!6937
This commit is contained in:
Rafael Ameijeiras 2024-02-15 08:25:17 +00:00
commit 28c71386e8
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pandora_console/extensions/quick_shell.php
View File

@ -394,7 +394,7 @@ function quickShellSettings()
__('Address'), __('Address'),
html_print_input_text( html_print_input_text(
'gotty_addr', 'gotty_addr',
$config['gotty_addr'], ($config['gotty_addr'] ?? ''),
'', '',
30, 30,
100, 100,
@ -443,9 +443,8 @@ function quickShellSettings()
html_print_checkbox_switch( html_print_checkbox_switch(
'gotty_ssh_use_ssl', 'gotty_ssh_use_ssl',
1, 1,
$config['gotty_ssh_use_ssl'], ($config['gotty_ssh_use_ssl'] ?? false),
true, true
$disable_agentaccess
) )
); );
@ -497,7 +496,7 @@ function quickShellSettings()
html_print_checkbox_switch( html_print_checkbox_switch(
'gotty_telnet_use_ssl', 'gotty_telnet_use_ssl',
1, 1,
$config['gotty_telnet_use_ssl'], ($config['gotty_telnet_use_ssl'] ?? false),
true true
) )
); );

4
pandora_console/include/functions_cron_task.php
View File

@ -504,7 +504,7 @@ function cron_task_start_gotty(bool $restart_mode=true)
} }
} }
if ($start_proc === true) { if ($start_proc === true && file_exists('/usr/bin/pandora_gotty') === true) {
$logFilePath = $config['homedir'].'/log/gotty_cron_tmp.log'; $logFilePath = $config['homedir'].'/log/gotty_cron_tmp.log';
shell_exec('touch '.$logFilePath); shell_exec('touch '.$logFilePath);
@ -527,7 +527,7 @@ function cron_task_start_gotty(bool $restart_mode=true)
while ((time() - $startTime) < $maxWaitTime) { while ((time() - $startTime) < $maxWaitTime) {
if ($start_proc === true) { if ($start_proc === true) {
// Read command output. // Read command output.
$log_content = file_get_contents($logFilePath); $log_content = @file_get_contents($logFilePath);
} }
if ($start_proc === true if ($start_proc === true