From 0fcd6f8641f48cc018e0c22fd13720c9dc4d2e94 Mon Sep 17 00:00:00 2001 From: koichirok Date: Mon, 21 May 2012 06:37:12 +0000 Subject: [PATCH] 2012-05-21 Koichiro Kikuchi * util/pandora_db.pl: Merged from 4.0.2: Set default DB port number when it's not specified in the configuration file. git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6324 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_server/ChangeLog | 5 +++++ pandora_server/util/pandora_db.pl | 1 + 2 files changed, 6 insertions(+) diff --git a/pandora_server/ChangeLog b/pandora_server/ChangeLog index 20d06ec61b..adcd84ce75 100644 --- a/pandora_server/ChangeLog +++ b/pandora_server/ChangeLog @@ -1,3 +1,8 @@ +2012-05-21 Koichiro Kikuchi + + * util/pandora_db.pl: Merged from 4.0.2: Set default DB port + number when it's not specified in the configuration file. + 2012-05-17 Sergio Martin * util/pandora_manage.pl: Added --create_network_module_from_component diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl index b44cd65006..cb4ae42213 100755 --- a/pandora_server/util/pandora_db.pl +++ b/pandora_server/util/pandora_db.pl @@ -378,6 +378,7 @@ sub pandora_load_config ($) { foreach my $param ('dbuser', 'dbpass', 'dbname', 'dbhost', 'log_file') { die ("[ERROR] Bad config values. Make sure " . $conf->{'_pandora_path'} . " is a valid config file.\n\n") unless defined ($conf->{$param}); } + $conf->{'dbport'} = '3306' unless defined ($conf->{'dbport'}); # Read additional tokens from the DB my $dbh = db_connect ('mysql', $conf->{'dbname'}, $conf->{'dbhost'}, $conf->{'dbport'}, $conf->{'dbuser'}, $conf->{'dbpass'});