You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficcontrol.apache.org by da...@apache.org on 2016/11/14 17:07:19 UTC
[16/53] [abbrv] incubator-trafficcontrol git commit: fixing dbdump.
fixing dbdump.
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/32afdf51
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/32afdf51
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/32afdf51
Branch: refs/heads/psql-rebase
Commit: 32afdf51073191f5204e3e310b67a69743a309f9
Parents: 16843c6
Author: Jackie Heitzer <ja...@cable.comcast.com>
Authored: Fri Aug 5 10:25:35 2016 -0600
Committer: Dan Kirkwood <da...@gmail.com>
Committed: Fri Nov 11 13:26:36 2016 -0700
----------------------------------------------------------------------
traffic_ops/app/db/admin.pl | 3 +++
traffic_ops/app/lib/UI/GenDbDump.pm | 14 ++++----------
traffic_ops/app/lib/UI/Tools.pm | 5 +----
3 files changed, 8 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/32afdf51/traffic_ops/app/db/admin.pl
----------------------------------------------------------------------
diff --git a/traffic_ops/app/db/admin.pl b/traffic_ops/app/db/admin.pl
index b635d80..4e1b3bc 100755
--- a/traffic_ops/app/db/admin.pl
+++ b/traffic_ops/app/db/admin.pl
@@ -123,6 +123,9 @@ if ( defined($argument) ) {
elsif ( $argument eq 'reverse_schema' ) {
reverse_schema();
}
+ else {
+ print $usage;
+ }
}
else {
print $usage;
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/32afdf51/traffic_ops/app/lib/UI/GenDbDump.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/UI/GenDbDump.pm b/traffic_ops/app/lib/UI/GenDbDump.pm
index 769de2e..44f9f11 100644
--- a/traffic_ops/app/lib/UI/GenDbDump.pm
+++ b/traffic_ops/app/lib/UI/GenDbDump.pm
@@ -19,28 +19,22 @@ use Mojo::Base 'Mojolicious::Controller';
sub dbdump {
my $self = shift;
-
my $filename = $self->param('filename');
-
-
my $db_user = $Schema::user;
my $db_pass = $Schema::pass;
my $db_name = ( split( /:/, $Schema::dsn ) )[2];
my $db_host = $Schema::hostname;
$db_name =~ s/database=//;
- my $cmd = "PG_PASSWORD='" . $db_pass . "' pg_dump --username=" . $db_user . " " . $db_name;
+ my $cmd = "pg_dump --username=" . $db_user . " " . $db_name . " > " . $filename;
my $extension = ".psql";
- if ( $self->db->storage->isa("DBIx::Class::Storage::DBI::mysql") ) {
- $cmd = "mysqldump -h " . $db_host . " -u " . $db_user . " -p" . $db_pass . " " . $db_name;
- $extension = ".mysql";
- }
+
my $data = `$cmd`;
-
+
$self->res->headers->content_type("application/download");
-
+
$self->res->headers->content_disposition( "attachment; filename=\"" . $filename . "\"" );
$self->render( data => $data );
}
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/32afdf51/traffic_ops/app/lib/UI/Tools.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/UI/Tools.pm b/traffic_ops/app/lib/UI/Tools.pm
index 81373b2..2482579 100644
--- a/traffic_ops/app/lib/UI/Tools.pm
+++ b/traffic_ops/app/lib/UI/Tools.pm
@@ -148,11 +148,8 @@ sub db_dump {
$year += 1900;
my $host = `hostname`;
chomp($host);
- my $extension = ".psql";
- if ( $self->db->storage->isa("DBIx::Class::Storage::DBI::mysql") ) {
- $extension = ".mysql";
- }
+ my $extension = ".psql";
my $filename = "to-backup-" . $host . "-" . $year . $month . $day . $hour . $min . $sec . $extension;
$self->stash( filename => $filename );
&stash_role($self);