seasharp
/
anvil
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #92 from ClusterLabs/anvil-tools-dev

Browse Source 
* Fixed (another) bug in Database->_archive_table() that was preventi…
main
digimer-bot 4 years ago committed by GitHub
parent 7cea567817 2f8becbb11
commit a90782bfdd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 7 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 12
      Anvil/Tools/Database.pm

12
Anvil/Tools/Database.pm
Unescape View File

@ -15598,7 +15598,11 @@ sub _archive_table
$loop++; $loop++;
# Are we archiving to disk? # Are we archiving to disk?
my $modified_date = "";
$do_delete = 1; $do_delete = 1;
my $archive_file = $directory."/".$anvil->Database->get_host_from_uuid({short => 1, host_uuid => $uuid}).".".$table.".".$time_stamp.".".$loop.".out";
$archive_file =~ s/\/\//\//g;
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => $debug, list => { archive_file => $archive_file }});
if ($anvil->data->{sys}{database}{archive}{save_to_disk}) if ($anvil->data->{sys}{database}{archive}{save_to_disk})
{ {
if (not -d $anvil->data->{sys}{database}{archive}{directory}) if (not -d $anvil->data->{sys}{database}{archive}{directory})
@ -15641,7 +15645,7 @@ COPY history.".$table." (";
"s3:sql_file" => $sql_file, "s3:sql_file" => $sql_file,
}}); }});
my $modified_date = $anvil->Database->query({uuid => $uuid, query => $query, source => $THIS_FILE, line => __LINE__})->[0]->[0]; $modified_date = $anvil->Database->query({uuid => $uuid, query => $query, source => $THIS_FILE, line => __LINE__})->[0]->[0];
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => $debug, list => { modified_date => $modified_date }}); $anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => $debug, list => { modified_date => $modified_date }});
# Build the query. # Build the query.
@ -15695,10 +15699,6 @@ COPY history.".$table." (";
$sql_file .= "\\.\n\n";; $sql_file .= "\\.\n\n";;
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => $debug, list => { sql_file => $sql_file }}); $anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => $debug, list => { sql_file => $sql_file }});
my $archive_file = $directory."/".$anvil->Database->get_host_from_uuid({short => 1, host_uuid => $uuid}).".".$table.".".$time_stamp.".".$loop.".out";
$archive_file =~ s/\/\//\//g;
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => $debug, list => { archive_file => $archive_file }});
# It may not be secure, but we play it safe. # It may not be secure, but we play it safe.
$anvil->Log->entry({source => $THIS_FILE, line => __LINE__, level => 1, key => "log_0454", variables => { $anvil->Log->entry({source => $THIS_FILE, line => __LINE__, level => 1, key => "log_0454", variables => {
records => $anvil->Convert->add_commas({number => $count}), records => $anvil->Convert->add_commas({number => $count}),
@ -15727,7 +15727,7 @@ COPY history.".$table." (";
} }
# Do Delete. # Do Delete.
if ($do_delete) if (($do_delete) && ($modified_date))
{ {
$anvil->Log->entry({source => $THIS_FILE, line => __LINE__, level => 1, key => "log_0283"}); $anvil->Log->entry({source => $THIS_FILE, line => __LINE__, level => 1, key => "log_0283"});
$vacuum = 1; $vacuum = 1;

Write Preview
Loading…
Cancel
Save