You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficcontrol.apache.org by mi...@apache.org on 2017/05/12 15:01:13 UTC
[1/4] incubator-trafficcontrol git commit: removed debug
Repository: incubator-trafficcontrol
Updated Branches:
refs/heads/master 0ecd27651 -> 507cbbf0e
removed debug
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/852ce2d9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/852ce2d9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/852ce2d9
Branch: refs/heads/master
Commit: 852ce2d96478ca39465dc5464a284451e7753a4a
Parents: 33df0ca
Author: Dewayne Richardson <de...@apache.org>
Authored: Fri May 12 08:55:49 2017 -0600
Committer: Jeremy Mitchell <mi...@gmail.com>
Committed: Fri May 12 08:59:19 2017 -0600
----------------------------------------------------------------------
traffic_ops/install/lib/Database.pm | 1 -
1 file changed, 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/852ce2d9/traffic_ops/install/lib/Database.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/install/lib/Database.pm b/traffic_ops/install/lib/Database.pm
index a8e98c6..be6310d 100644
--- a/traffic_ops/install/lib/Database.pm
+++ b/traffic_ops/install/lib/Database.pm
@@ -40,7 +40,6 @@ sub connect {
$ENV{PGPASSWORD} = $conf->{"password"};
my $dsn = sprintf( "DBI:%s:db=%s;host=%s;port=%d", $conf->{type}, $dbName, $conf->{hostname}, $conf->{port} );
- InstallUtils::logger( "dsn: " . $dsn, "info" );
my $dbh = DBI->connect( $dsn, $todbconf->{"user"}, $todbconf->{"password"} );
if ($dbh) {
InstallUtils::logger( "Database connection succeeded", "info" );
[2/4] incubator-trafficcontrol git commit: fixed formatting
Posted by mi...@apache.org.
fixed formatting
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/33df0cac
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/33df0cac
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/33df0cac
Branch: refs/heads/master
Commit: 33df0cac9ea0d98f2d3acaf5d540d6b7c4d4f9a7
Parents: 5ef3d40
Author: Dewayne Richardson <de...@apache.org>
Authored: Fri May 12 08:55:17 2017 -0600
Committer: Jeremy Mitchell <mi...@gmail.com>
Committed: Fri May 12 08:59:19 2017 -0600
----------------------------------------------------------------------
traffic_ops/install/lib/Database.pm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/33df0cac/traffic_ops/install/lib/Database.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/install/lib/Database.pm b/traffic_ops/install/lib/Database.pm
index 57f6c90..a8e98c6 100644
--- a/traffic_ops/install/lib/Database.pm
+++ b/traffic_ops/install/lib/Database.pm
@@ -36,8 +36,8 @@ sub connect {
$dbName = "traffic_ops";
}
- $ENV{PGUSER} = $conf->{"user"};
- $ENV{PGPASSWORD} = $conf->{"password"};
+ $ENV{PGUSER} = $conf->{"user"};
+ $ENV{PGPASSWORD} = $conf->{"password"};
my $dsn = sprintf( "DBI:%s:db=%s;host=%s;port=%d", $conf->{type}, $dbName, $conf->{hostname}, $conf->{port} );
InstallUtils::logger( "dsn: " . $dsn, "info" );
[3/4] incubator-trafficcontrol git commit: fixed issue where the
wrong conf file was being read
Posted by mi...@apache.org.
fixed issue where the wrong conf file was being read
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/5ef3d40f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/5ef3d40f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/5ef3d40f
Branch: refs/heads/master
Commit: 5ef3d40f2edf01b0345f0e7e31e7627b7f8278f9
Parents: 0ecd276
Author: Dewayne Richardson <de...@apache.org>
Authored: Fri May 12 08:53:30 2017 -0600
Committer: Jeremy Mitchell <mi...@gmail.com>
Committed: Fri May 12 08:59:19 2017 -0600
----------------------------------------------------------------------
traffic_ops/install/lib/Database.pm | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/5ef3d40f/traffic_ops/install/lib/Database.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/install/lib/Database.pm b/traffic_ops/install/lib/Database.pm
index 9dbbc31..57f6c90 100644
--- a/traffic_ops/install/lib/Database.pm
+++ b/traffic_ops/install/lib/Database.pm
@@ -28,19 +28,20 @@ sub connect {
my $databaseConfFile = shift;
my $todbconf = shift;
- my $dbconf = InstallUtils::readJson($databaseConfFile);
+ my $conf = InstallUtils::readJson($databaseConfFile);
# Check if the Postgres db is used and set the admin database to be "postgres"
- my $dbName = $dbconf->{type};
- if ( $dbconf->{type} eq "Pg" ) {
+ my $dbName = $conf->{type};
+ if ( $conf->{type} eq "Pg" ) {
$dbName = "traffic_ops";
}
- $ENV{PGUSER} = $todbconf->{"pgUser"};
- $ENV{PGPASSWORD} = $todbconf->{"pgPassword"};
+ $ENV{PGUSER} = $conf->{"user"};
+ $ENV{PGPASSWORD} = $conf->{"password"};
- my $dsn = sprintf( "DBI:%s:db=%s;host=%s;port=%d", $dbconf->{type}, $dbName, $dbconf->{hostname}, $dbconf->{port} );
- my $dbh = DBI->connect( $dsn, $todbconf->{"pgUser"}, $todbconf->{"pgPassword"} );
+ my $dsn = sprintf( "DBI:%s:db=%s;host=%s;port=%d", $conf->{type}, $dbName, $conf->{hostname}, $conf->{port} );
+ InstallUtils::logger( "dsn: " . $dsn, "info" );
+ my $dbh = DBI->connect( $dsn, $todbconf->{"user"}, $todbconf->{"password"} );
if ($dbh) {
InstallUtils::logger( "Database connection succeeded", "info" );
}
[4/4] incubator-trafficcontrol git commit: This closes #571
Posted by mi...@apache.org.
This closes #571
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/507cbbf0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/507cbbf0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/507cbbf0
Branch: refs/heads/master
Commit: 507cbbf0e53ba6b218b45ef572df6a7d529a5058
Parents: 852ce2d
Author: Jeremy Mitchell <mi...@gmail.com>
Authored: Fri May 12 09:01:05 2017 -0600
Committer: Jeremy Mitchell <mi...@gmail.com>
Committed: Fri May 12 09:01:05 2017 -0600
----------------------------------------------------------------------
----------------------------------------------------------------------