tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '5055-API-Nuevo-automatismo-para-generacion-graficas' into 'develop' 

Solved issue with logger message when default path was assumed

See merge request artica/pandorafms!3033
This commit is contained in:
Daniel Rodriguez 2020-01-29 13:04:01 +01:00
parent 0cf42f2d74 d1e545da24
commit 747b482864
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pandora_server/bin/pandora_server
View File

@ -580,14 +580,14 @@ sub main() {
# Only if console_api_url was not defined # Only if console_api_url was not defined
if( !defined($Config{"console_api_url"}) ) { if( !defined($Config{"console_api_url"}) ) {
my $console_api_url = pandora_get_tconfig_token ($DBH, 'public_url', ''); my $console_api_url = pandora_get_tconfig_token ($DBH, 'public_url', '');
my $include_api = 'include/api.php';
# If public_url is empty in database # If public_url is empty in database
if ( $console_api_url eq '' ) { if ( $console_api_url eq '' ) {
$console_api_url = 'http://localhost/pandora_console/'; $Config{"console_api_url"} = 'http://localhost/pandora_console/' . $include_api;
logger(\%Config, "Assuming default path for API url: " . $console_api_url, 3); logger(\%Config, "Assuming default path for API url: " . $Config{"console_api_url"}, 3);
} else {
$Config{"console_api_url"} = $console_api_url . $include_api;
} }
$Config{"console_api_url"} = $console_api_url . 'include/api.php';
} }
# Definition of configuration file # Definition of configuration file