You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficcontrol.apache.org by de...@apache.org on 2017/04/20 19:21:55 UTC
[2/4] incubator-trafficcontrol git commit: remove .gz from filename,
update API with dump fixes
remove .gz from filename, update API with dump fixes
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/524728d5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/524728d5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/524728d5
Branch: refs/heads/master
Commit: 524728d5fb83acf743cbf7fecd85a70feae444d1
Parents: 4e749f0
Author: Derek Gelinas <de...@cable.comcast.com>
Authored: Thu Apr 20 14:56:59 2017 -0400
Committer: Dewayne Richardson <de...@apache.org>
Committed: Thu Apr 20 13:21:41 2017 -0600
----------------------------------------------------------------------
traffic_ops/app/lib/API/Database.pm | 8 +++-----
traffic_ops/app/lib/UI/Tools.pm | 2 +-
2 files changed, 4 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/524728d5/traffic_ops/app/lib/API/Database.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/API/Database.pm b/traffic_ops/app/lib/API/Database.pm
index 52a54ad..3428606 100644
--- a/traffic_ops/app/lib/API/Database.pm
+++ b/traffic_ops/app/lib/API/Database.pm
@@ -33,7 +33,7 @@ sub dbdump {
my $db_user = $Schema::user;
my $db_pass = $Schema::pass;
- my $ok = open my $fh, '-|', "PGPASSWORD=/\"$db_pass/\" pg_dump -b -Fc --no-owner -h $host -p $port -U $db_user";
+ my $ok = open my $fh, '-|', "PGPASSWORD=\"$db_pass\" pg_dump -b -Fc --no-owner -h $host -p $port -U $db_user -d $db_name";
if (! $ok ) {
$self->internal_server_error( { Error => "Error dumping database" } );
return;
@@ -42,13 +42,11 @@ sub dbdump {
# slurp it in..
undef $/;
my $data = <$fh>;
- my $zipdata;
- gzip \$data => \$zipdata;
$self->res->headers->content_type("application/download");
$self->res->headers->content_disposition( "attachment; filename=\"" . $filename . "\"" );
- $self->render( data => $zipdata );
+ $self->render( data => $data );
close $fh;
}
@@ -63,7 +61,7 @@ sub get_filename {
my $host = `hostname`;
chomp($host);
- my $extension = ".dump.gz";
+ my $extension = ".dump";
my $filename = "to-backup-" . $host . "-" . $year . $month . $day . $hour . $min . $sec . $extension;
return $filename;
}
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/524728d5/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 199f8f6..9af157c 100644
--- a/traffic_ops/app/lib/UI/Tools.pm
+++ b/traffic_ops/app/lib/UI/Tools.pm
@@ -153,7 +153,7 @@ sub db_dump {
my $host = `hostname`;
chomp($host);
- my $extension = ".dump.gz";
+ my $extension = ".dump";
my $filename = "to-backup-" . $host . "-" . $year . $month . $day . $hour . $min . $sec . $extension;
$self->stash( filename => $filename );
&stash_role($self);